The big character set handling changeover!

[kai/samba.git] / source3 / lib / util.c

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 2e2c887b93f3807d3efa70a5aa8cdba9d8f6d8b8..a8ef69e5593d4bd65c484875c5f8041039f3edcb 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -194,21 +194,6 @@ BOOL file_exist(char *fname,SMB_STRUCT_STAT *sbuf)
   return(S_ISREG(sbuf->st_mode));
 }
 
-/*******************************************************************
-  rename a unix file
-********************************************************************/
-int file_rename(char *from, char *to)
-{
-       int rcode = rename (from, to);
-
-       if (errno == EXDEV) 
-       {
-               /* Rename across filesystems needed. */
-               rcode = copy_reg (from, to);        
-       }
-       return rcode;
-}
-
 /*******************************************************************
 check a files mod time
 ********************************************************************/
@@ -790,7 +775,7 @@ BOOL is_ipaddress(const char *str)
 interpret an internet address or name into an IP address in 4 byte form
 ****************************************************************************/
 
-uint32 interpret_addr(char *str)
+uint32 interpret_addr(const char *str)
 {
   struct hostent *hp;
   uint32 res;
@@ -823,7 +808,7 @@ uint32 interpret_addr(char *str)
 /*******************************************************************
   a convenient addition to interpret_addr()
   ******************************************************************/
-struct in_addr *interpret_addr2(char *str)
+struct in_addr *interpret_addr2(const char *str)
 {
   static struct in_addr ret;
   uint32 a = interpret_addr(str);