summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-09-21 01:43:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:55 -0500
commit992442cbf9d53df81a8770995043bd9b75d16828 (patch)
tree278e94dfeb0f1eadf63574dfa1674c701dddfad3
parente649dcc09c0e3ac0323cd5d2f224e47d90b0fd35 (diff)
downloadsamba-992442cbf9d53df81a8770995043bd9b75d16828.tar.gz
samba-992442cbf9d53df81a8770995043bd9b75d16828.tar.bz2
samba-992442cbf9d53df81a8770995043bd9b75d16828.zip
r2456: got rid of some outdated global macros
(This used to be commit ea7eac5e3fb8f0db8d412a95ef4dc7889a07bc73)
-rw-r--r--source4/client/client.c9
-rw-r--r--source4/include/smb_macros.h13
2 files changed, 8 insertions, 14 deletions
diff --git a/source4/client/client.c b/source4/client/client.c
index 33d3e695f2..45aac0444b 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -259,6 +259,13 @@ static int cmd_pwd(const char **cmd_ptr)
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 @@ static void do_mget(file_info *finfo)
pstrcat(cur_dir,finfo->name);
pstrcat(cur_dir,"\\");
- unix_format(finfo->name);
+ string_replace(finfo->name, '\\', '/');
if (lowercase)
strlower(finfo->name);
diff --git a/source4/include/smb_macros.h b/source4/include/smb_macros.h
index bbf904fbfa..84978f4f70 100644
--- a/source4/include/smb_macros.h
+++ b/source4/include/smb_macros.h
@@ -162,17 +162,4 @@ copy an IP address from one buffer to another
#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 */