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

diff --git a/callerid.c b/callerid.c
index 47b51da..b9e59ab 100644
--- a/callerid.c
+++ b/callerid.c
@@ -9,19 +9,23 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#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,21 +37,23 @@ 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)
 	{
 		case INFO_NTYPE_INTERNATIONAL:
-		UCPY(result, international);
-		SCAT(result, string);
+		strcpy(result, international);
+		strncat(result, string, sizeof(result));
+		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));
+		result[sizeof(result)-1] = '\0';
 		return(result);
 		break;