mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

silence 2 more warningsi; fix a potential NULL assignment on the way

Browse Source
This commit is contained in:
marschap
2006-04-14 09:59:54 +00:00
parent e4812666d8
commit 08574b8baa
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/main.c
+7 -2
View File
@@ -310,9 +310,14 @@ process_command_line(int argc, char **argv)
case 'd': case 'd':
/* Add to a list of drivers to be initialized later...*/ /* Add to a list of drivers to be initialized later...*/
if (num_drivers < MAX_DRIVERS) { if (num_drivers < MAX_DRIVERS) {
drivernames[num_drivers] = malloc( strlen(optarg)+1 ); drivernames[num_drivers] = strdup(optarg);
strcpy( drivernames[num_drivers], optarg ); if (drivernames[num_drivers] != NULL) {
num_drivers ++; num_drivers ++;
}
else {
report(RPT_ERR, "alloc error storing driver name: %s", optarg);
e = -1
}
} else { } else {
report( RPT_ERR, "Too many drivers!" ); report( RPT_ERR, "Too many drivers!" );
e = -1; e = -1;
shared/sockets.c
+1 -1
View File
@@ -315,7 +315,7 @@ sock_printf_error(int fd, const char *format, .../*args*/ )
va_list ap; va_list ap;
int size = 0; int size = 0;
strcpy(buf, huh); strncpy(buf, huh, sizeof(huh)); // note: sizeof(huh) < MAXMSG
va_start(ap, format); va_start(ap, format);
size = vsnprintf(buf + (sizeof(huh)-1), sizeof(buf) - (sizeof(huh)-1), format, ap); size = vsnprintf(buf + (sizeof(huh)-1), sizeof(buf) - (sizeof(huh)-1), format, ap);