diff options
| -rw-r--r-- | source4/client/client.c | 6 | ||||
| -rw-r--r-- | source4/include/byteorder.h | 2 | ||||
| -rw-r--r-- | source4/include/smb_interfaces.h | 3 | ||||
| -rw-r--r-- | source4/lib/debug.c | 4 | ||||
| -rw-r--r-- | source4/libcli/clifile.c | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 965984313d..7f05774836 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -2402,8 +2402,12 @@ static char **remote_completion(const char *text, int len) { pstring dirmask; int i; - completion_remote_t info = { "", NULL, 1, len, text, len }; + completion_remote_t info = { "", NULL, 1, NULL, NULL, NULL }; + info.samelen = len; + info.text = text; + info.len = len; + if (len >= PATH_MAX) return(NULL); diff --git a/source4/include/byteorder.h b/source4/include/byteorder.h index ed0eababdd..94a346f89d 100644 --- a/source4/include/byteorder.h +++ b/source4/include/byteorder.h @@ -106,7 +106,7 @@ it also defines lots of intermediate macros, just ignore those :-) #endif #define CVAL(buf,pos) ((unsigned)(((const unsigned char *)(buf))[pos])) -#define CVAL_NC(buf,pos) ((unsigned)(((unsigned char *)(buf))[pos])) /* Non-const version of CVAL */ +#define CVAL_NC(buf,pos) (((unsigned char *)(buf))[pos]) /* Non-const version of CVAL */ #define PVAL(buf,pos) (CVAL(buf,pos)) #define SCVAL(buf,pos,val) (CVAL_NC(buf,pos) = (val)) diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h index 30e5efe97e..575590c364 100644 --- a/source4/include/smb_interfaces.h +++ b/source4/include/smb_interfaces.h @@ -1454,9 +1454,6 @@ union smb_lock { struct { enum lock_level level; - struct { - - } in; } generic; /* SMBlock interface */ diff --git a/source4/lib/debug.c b/source4/lib/debug.c index 37f93b9ae5..792cf14c5a 100644 --- a/source4/lib/debug.c +++ b/source4/lib/debug.c @@ -129,13 +129,13 @@ const char *do_debug_tab(uint_t n) void log_suspicious_usage(const char *from, const char *info) { if (debug_handlers.ops.log_suspicious_usage) { - return debug_handlers.ops.log_suspicious_usage(from, info); + debug_handlers.ops.log_suspicious_usage(from, info); } } void print_suspicious_usage(const char* from, const char* info) { if (debug_handlers.ops.print_suspicious_usage) { - return debug_handlers.ops.print_suspicious_usage(from, info); + debug_handlers.ops.print_suspicious_usage(from, info); } } diff --git a/source4/libcli/clifile.c b/source4/libcli/clifile.c index cd01d51017..d37a68c1e1 100644 --- a/source4/libcli/clifile.c +++ b/source4/libcli/clifile.c @@ -505,11 +505,11 @@ BOOL cli_getattrE(struct cli_state *cli, int fd, } if (a_time) { - *a_time = &parms.getattre.out.access_time; + *a_time = parms.getattre.out.access_time; } if (m_time) { - *m_time = &parms.getattre.out.write_time; + *m_time = parms.getattre.out.write_time; } return True; |