*/
const char *nationalize_callerinfo(const char *string, int *ntype, const char *national, const char *international)
{
- if (!strncmp(international, string, strlen(international)))
- {
+ if (!strncmp(international, string, strlen(international))) {
*ntype = INFO_NTYPE_INTERNATIONAL;
return(string+strlen(international));
}
- if (!strncmp(national, string, strlen(national)))
- {
+ if (!strncmp(national, string, strlen(national))) {
*ntype = INFO_NTYPE_NATIONAL;
return(string+strlen(national));
}
{
static char result[256];
- switch(ntype)
- {
+ switch(ntype) {
+ case INFO_NTYPE_NOTPRESENT:
+ return("");
+
case INFO_NTYPE_INTERNATIONAL:
strcpy(result, international);
- strncat(result, string, sizeof(result));
+ strncat(result, string, sizeof(result)-strlen(result)-1);
result[sizeof(result)-1] = '\0';
return(result);
break;
case INFO_NTYPE_NATIONAL:
strcpy(result, national);
- strncat(result, string, sizeof(result));
+ strncat(result, string, sizeof(result)-strlen(result)-1);
result[sizeof(result)-1] = '\0';
return(result);
break;