case INFO_NTYPE_INTERNATIONAL:
strcpy(result, international);
- strncat(result, string, sizeof(result)-strlen(result)-1);
+ strncat(result, string, sizeof(result)-1);
result[sizeof(result)-1] = '\0';
return(result);
break;
case INFO_NTYPE_NATIONAL:
strcpy(result, national);
- strncat(result, string, sizeof(result)-strlen(result)-1);
+ strncat(result, string, sizeof(result)-1);
result[sizeof(result)-1] = '\0';
return(result);
break;
default:
- return(string);
+ strncpy(result, string, sizeof(result)-1);
+ result[sizeof(result)-1] = '\0';
+ return(result);
}
}
int ret;
struct sockaddr_mISDN addr;
+ memset(&addr, 0, sizeof(addr));
+
if (mISDNport->b_sock[i].inuse) {
PERROR("Error: Socket already created for index %d\n", i);
return(0);
struct mISDN_devinfo devinfo;
int port = 0, ret;
+ memset(&devinfo, 0, sizeof(devinfo));
+
/* resolve name */
while (port < cnt) {
devinfo.id = port;
struct mISDN_devinfo devinfo;
unsigned int protocol, prop;
+ memset(&devinfo, 0, sizeof(devinfo));
+
/* check port counts */
ret = ioctl(mISDNsocket, IMGETCOUNT, &cnt);
if (ret < 0) {
return buffer;
if (buffer[strlen(buffer)-1] == '\n')
buffer[strlen(buffer)-1] = '\0';
+ if (!buffer[0])
+ return buffer;
if (buffer[strlen(buffer)-1] == '\r')
buffer[strlen(buffer)-1] = '\0';
return buffer;
debug_count++;
join_free();
- /* free interfaces */
- if (interface_first)
- free_interfaces(interface_first);
- interface_first = NULL;
-
#ifdef WITH_MISDN
/* close isdn ports */
mISDNport_close_all();
#endif
+ /* free interfaces */
+ if (interface_first)
+ free_interfaces(interface_first);
+ interface_first = NULL;
+
/* flush messages */
debug_count++;
i = 0;
case CODEC_MONO:
case CODEC_STEREO:
case CODEC_8BIT:
+ memset(&dummyheader, 0, sizeof(dummyheader));
ret = fwrite(dummyheader, sizeof(dummyheader), 1, p_record);
break;