sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

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

Browse Source 
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 commit is contained in:
Herb Lewis -
parent c4cc40c5c8
commit 9a72476201
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/client/client.c
View File

@ -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);

2
source/include/byteorder.h
View File

@ -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))

3
source/include/smb_interfaces.h
View File

@ -1454,9 +1454,6 @@ union smb_lock {
struct {
enum lock_level level;
struct {
} in;
} generic;
/* SMBlock interface */

4
source/lib/debug.c
View File

@ -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);
}
}

4
source/libcli/clifile.c
View File

@ -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;