diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-03-17 22:56:13 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-03-17 22:56:13 +0000 |
| commit | ad0d6509a761154c113e040a82ad78e72a3ccf30 (patch) | |
| tree | 13f4b6188945bfd1ada57e76c612f45a21bce5e2 /source3/smbd/reply.c | |
| parent | f06d1b240a0cc15bc50c907198c06fcd826d63b2 (diff) | |
| download | samba-ad0d6509a761154c113e040a82ad78e72a3ccf30.tar.gz samba-ad0d6509a761154c113e040a82ad78e72a3ccf30.tar.bz2 samba-ad0d6509a761154c113e040a82ad78e72a3ccf30.zip | |
Merge from HEAD:
- Make ReadDirName return a const char*.
- Consequential changes from that
- mark our fstring/pstring assumptions in function prototypes
Andrew Bartlett
(This used to be commit 10b53d7c6fd77f23433dd2ef12bb14b227147a48)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 71e880476c..ff1c0e5a52 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1305,7 +1305,7 @@ NTSTATUS unlink_internals(connection_struct *conn, int dirtype, char *name) } } else { void *dirptr = NULL; - char *dname; + const char *dname; if (check_name(directory,conn)) dirptr = OpenDir(conn, directory, True); @@ -2861,7 +2861,7 @@ int reply_mkdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, static BOOL recursive_rmdir(connection_struct *conn, char *directory) { - char *dname = NULL; + const char *dname = NULL; BOOL ret = False; void *dirptr = OpenDir(conn, directory, False); @@ -2926,7 +2926,7 @@ BOOL rmdir_internals(connection_struct *conn, char *directory) * do a recursive delete) then fail the rmdir. */ BOOL all_veto_files = True; - char *dname; + const char *dname; void *dirptr = OpenDir(conn, directory, False); if(dirptr != NULL) { @@ -3285,7 +3285,7 @@ directory = %s, newname = %s, newname_last_component = %s, is_8_3 = %d\n", * Wildcards - process each file that matches. */ void *dirptr = NULL; - char *dname; + const char *dname; pstring destname; if (check_name(directory,conn)) @@ -3574,7 +3574,7 @@ int reply_copy(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, } } else { void *dirptr = NULL; - char *dname; + const char *dname; pstring destname; if (check_name(directory,conn)) |