diff options
Diffstat (limited to 'modules/network')
| -rw-r--r-- | modules/network/net.c | 4 | ||||
| -rw-r--r-- | modules/network/samba.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/modules/network/net.c b/modules/network/net.c index 9f5d5cb3..04c20d2a 100644 --- a/modules/network/net.c +++ b/modules/network/net.c @@ -85,7 +85,7 @@ void get_wireless_info(int fd, NetInfo *netinfo) FILE *wrls; char wbuf[256]; struct iwreq wi_req; - int r, trash; + int trash; netinfo->is_wireless = FALSE; @@ -181,7 +181,7 @@ void get_net_info(char *if_name, NetInfo * netinfo) /* IPv4 */ ifr.ifr_addr.sa_family = AF_INET; - strncpy(netinfo->name, if_name, sizeof(netinfo->name)); + memcpy(netinfo->name, if_name, sizeof(netinfo->name)); /* MTU */ strcpy(ifr.ifr_name, if_name); diff --git a/modules/network/samba.c b/modules/network/samba.c index e14742ea..7edcbe0b 100644 --- a/modules/network/samba.c +++ b/modules/network/samba.c @@ -50,7 +50,6 @@ scan_samba(void) void scan_samba_usershares(void) { - FILE *usershare_list; gboolean spawned; int status; gchar *out, *err, *p, *next_nl; @@ -63,7 +62,7 @@ scan_samba_usershares(void) if (spawned && status == 0 && out != NULL) { shell_status_update("Scanning SAMBA user shares..."); p = out; - while(next_nl = strchr(p, '\n')) { + while((next_nl = strchr(p, '\n'))) { cmdline = g_strdup_printf("net usershare info '%s'", strend(p, '\n')); if (hardinfo_spawn_command_line_sync(cmdline, |