svn commit: samba r2456 - in branches/SAMBA_4_0/source: client include

tridge at samba.org tridge at samba.org
Tue Sep 21 01:43:55 GMT 2004


Author: tridge
Date: 2004-09-21 01:43:53 +0000 (Tue, 21 Sep 2004)
New Revision: 2456

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2456&nolog=1

Log:
got rid of some outdated global macros



Modified:
   branches/SAMBA_4_0/source/client/client.c
   branches/SAMBA_4_0/source/include/smb_macros.h


Changeset:
Modified: branches/SAMBA_4_0/source/client/client.c
===================================================================
--- branches/SAMBA_4_0/source/client/client.c	2004-09-21 01:43:08 UTC (rev 2455)
+++ branches/SAMBA_4_0/source/client/client.c	2004-09-21 01:43:53 UTC (rev 2456)
@@ -259,6 +259,13 @@
 	return 0;
 }
 
+/*
+  convert a string to dos format
+*/
+static void dos_format(char *s)
+{
+	string_replace(s, '/', '\\');
+}
 
 /****************************************************************************
 change directory - inner section
@@ -858,7 +865,7 @@
 	pstrcat(cur_dir,finfo->name);
 	pstrcat(cur_dir,"\\");
 
-	unix_format(finfo->name);
+	string_replace(finfo->name, '\\', '/');
 	if (lowercase)
 		strlower(finfo->name);
 	

Modified: branches/SAMBA_4_0/source/include/smb_macros.h
===================================================================
--- branches/SAMBA_4_0/source/include/smb_macros.h	2004-09-21 01:43:08 UTC (rev 2455)
+++ branches/SAMBA_4_0/source/include/smb_macros.h	2004-09-21 01:43:53 UTC (rev 2456)
@@ -162,17 +162,4 @@
 
 #define SERVER_HAS_UNIX_CIFS(c) (cli_state_has_unix_cifs(c))
 
-/****************************************************************************
- Make a filename into unix format.
-****************************************************************************/
-
-#define unix_format(fname) string_replace(fname,'\\','/')
-#define unix_format_w(fname) string_replace_w(fname, UCS2_CHAR('\\'), UCS2_CHAR('/'))
-
-/****************************************************************************
- Make a file into DOS format.
-****************************************************************************/
-
-#define dos_format(fname) string_replace(fname,'/','\\')
-
 #endif /* _SMB_MACROS_H */



More information about the samba-cvs mailing list