svn commit: samba r3931 - in branches/SAMBA_3_0/source: client
libsmb nsswitch passdb utils
jra at samba.org
jra at samba.org
Wed Nov 24 01:03:23 GMT 2004
Author: jra
Date: 2004-11-24 01:03:23 +0000 (Wed, 24 Nov 2004)
New Revision: 3931
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3931
Log:
Fix all "may be used uninitialized" and "shadow" warnings.
Jeremy.
Modified:
branches/SAMBA_3_0/source/client/client.c
branches/SAMBA_3_0/source/libsmb/libsmbclient.c
branches/SAMBA_3_0/source/nsswitch/winbindd_wins.c
branches/SAMBA_3_0/source/passdb/pdb_sql.c
branches/SAMBA_3_0/source/utils/status.c
Changeset:
Modified: branches/SAMBA_3_0/source/client/client.c
===================================================================
--- branches/SAMBA_3_0/source/client/client.c 2004-11-23 23:13:53 UTC (rev 3930)
+++ branches/SAMBA_3_0/source/client/client.c 2004-11-24 01:03:23 UTC (rev 3931)
@@ -2816,10 +2816,12 @@
return NULL;
} else {
char **matches;
- int i, len, samelen, count=1;
+ int i, len, samelen = 0, count=1;
matches = (char **)malloc(sizeof(matches[0])*MAX_COMPLETIONS);
- if (!matches) return NULL;
+ if (!matches) {
+ return NULL;
+ }
matches[0] = NULL;
len = strlen(text);
Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c 2004-11-23 23:13:53 UTC (rev 3930)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c 2004-11-24 01:03:23 UTC (rev 3931)
@@ -1697,7 +1697,7 @@
struct smbc_dir_list *dir_list;
struct smbc_dirent *dirent;
int dirent_type;
- int remove = 0;
+ int do_remove = 0;
dirent_type = dir->dir_type;
@@ -1714,13 +1714,13 @@
for (dir_list = dir->dir_list;
dir_list != dir->dir_end;
dir_list = dir_list->next) {
- if (! remove &&
+ if (! do_remove &&
strcmp(dir_list->dirent->name, dirent->name) == 0) {
/* Duplicate. End end of list need to be removed. */
- remove = 1;
+ do_remove = 1;
}
- if (remove && dir_list->next == dir->dir_end) {
+ if (do_remove && dir_list->next == dir->dir_end) {
/* Found the end of the list. Remove it. */
dir->dir_end = dir_list;
free(dir_list->next);
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_wins.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_wins.c 2004-11-23 23:13:53 UTC (rev 3930)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_wins.c 2004-11-24 01:03:23 UTC (rev 3931)
@@ -88,7 +88,7 @@
{
int fd;
struct ip_service *ret = NULL;
- struct in_addr *return_ip;
+ struct in_addr *return_ip = NULL;
int j, i, flags = 0;
*count = 0;
@@ -121,7 +121,9 @@
j--) {
struct in_addr *bcast = iface_n_bcast(j);
return_ip = name_query(fd,name,0x20,True,True,*bcast,count, &flags, NULL);
- if (return_ip) break;
+ if (return_ip) {
+ break;
+ }
}
close(fd);
Modified: branches/SAMBA_3_0/source/passdb/pdb_sql.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_sql.c 2004-11-23 23:13:53 UTC (rev 3930)
+++ branches/SAMBA_3_0/source/passdb/pdb_sql.c 2004-11-24 01:03:23 UTC (rev 3931)
@@ -201,6 +201,9 @@
field_string = config_value_read(data, "username column",
CONFIG_USERNAME_DEFAULT);
break;
+ default:
+ field_string = "unknown";
+ break;
}
asprintf(&query,
Modified: branches/SAMBA_3_0/source/utils/status.c
===================================================================
--- branches/SAMBA_3_0/source/utils/status.c 2004-11-23 23:13:53 UTC (rev 3930)
+++ branches/SAMBA_3_0/source/utils/status.c 2004-11-24 01:03:23 UTC (rev 3931)
@@ -50,20 +50,20 @@
const char *username = NULL;
/* added by OH */
-static void Ucrit_addUsername(const char *username)
+static void Ucrit_addUsername(const char *user_name)
{
- pstrcpy(Ucrit_username, username);
+ pstrcpy(Ucrit_username, user_name);
if ( strlen(Ucrit_username) > 0 )
Ucrit_IsActive = 1;
}
-static unsigned int Ucrit_checkUsername(const char *username)
+static unsigned int Ucrit_checkUsername(const char *user_name)
{
if ( !Ucrit_IsActive )
return 1;
- if ( strcmp(Ucrit_username,username) == 0 )
+ if ( strcmp(Ucrit_username,user_name) == 0 )
return 1;
return 0;
More information about the samba-cvs
mailing list