X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=callerid.c;h=2f12ac184711069752ad1745f625479aee40b511;hp=47b51da61c722042614c987e34a75d5dfd508439;hb=fb69e2c10cecb7bbdf6ca4ade978cb9cf7b34369;hpb=0efcf371b4a61fa1376e83d2b7404aeb47a36e26

diff --git a/callerid.c b/callerid.c
index 47b51da..2f12ac1 100644
--- a/callerid.c
+++ b/callerid.c
@@ -9,20 +9,22 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include "main.h"
+#include <string.h>
+#include <time.h>
+#include "extension.h"
+#include "message.h"
+#include "callerid.h"
 
 /* create caller id from digits by comparing with national and international
  * prefixes.
  */
-char *nationalize_callerinfo(char *string, int *ntype, char *national, char *international)
+const char *nationalize_callerinfo(const char *string, int *ntype, const char *national, const char *international)
 {
-	if (!strncmp(options.international, string, strlen(options.international)))
-	{
+	if (!strncmp(international, string, strlen(international))) {
 		*ntype = INFO_NTYPE_INTERNATIONAL;
 		return(string+strlen(international)); 
 	}
-	if (!strncmp(options.national, string, strlen(options.national)))
-	{
+	if (!strncmp(national, string, strlen(national))) {
 		*ntype = INFO_NTYPE_NATIONAL;
 		return(string+strlen(national)); 
 	}
@@ -33,26 +35,32 @@ char *nationalize_callerinfo(char *string, int *ntype, char *national, char *int
 /* create number (including access codes) from caller id
  * prefixes.
  */
-char *numberrize_callerinfo(char *string, int ntype, char *national, char *international)
+const char *numberrize_callerinfo(const char *string, int ntype, const char *national, const char *international)
 {
 	static char result[256];
 
-	switch(ntype)
-	{
+	switch(ntype) {
+		case INFO_NTYPE_NOTPRESENT:
+		return("");
+
 		case INFO_NTYPE_INTERNATIONAL:
-		UCPY(result, international);
-		SCAT(result, string);
+		strcpy(result, international);
+		strncat(result, string, sizeof(result)-1);
+		result[sizeof(result)-1] = '\0';
 		return(result);
 		break;
 
 		case INFO_NTYPE_NATIONAL:
-		UCPY(result, national);
-		SCAT(result, string);
+		strcpy(result, national);
+		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);
 	}
 }