client/client.c - cannot initialize struct with non-const values

include/byteorder.h - fix for IRIX compiler - cannot cast an LVALUE
include/smb_interfaces.h - remove empty structure
source/lib/debug.c - void functions cannot return value
libcli/clifile.c - cannot assign *struct to struct
(This used to be commit 9a724762012f55d21d44ea87add7daf21f7414d1)

diff --git a/source4/client/client.c b/source4/client/client.c
index 965984313d38dd93ecc95062d997fc7b2b36ac53..7f0577483602879b6861ccb3a78bde1dca262e6f 100644 (file)
--- 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 ed0eababddebeaecd9bbe65f32066a4ac6ee3b8e..94a346f89d9943249fb78e7297a8beb26f516d80 100644 (file)
--- 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 30e5efe97e97063838545c48d454dbd29712ef6e..575590c364fa309a3479b0c890eb1462581d8118 100644 (file)
--- 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 37f93b9ae5ef82917a437f7bf492770b0279e0b1..792cf14c5a89ebfbf8e610577bd732043ceb3fdf 100644 (file)
--- 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 cd01d510179f384cf168533d24dcaeebd971255a..d37a68c1e15a76ca34a5f6dccd7dba88ce8f2199 100644 (file)
--- 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;