Indent the configure script for more readability.

[thirdparty/sarg.git] / ip2name.c

diff --git a/ip2name.c b/ip2name.c
index f201f5f348cf9cb83fd37ce3eb37061bfcf25dca..d30f3f787d73c798a3a87b76d7f0bcbeaedda227 100644 (file)
--- a/ip2name.c
+++ b/ip2name.c
@@ -63,12 +63,12 @@ static void ip2name_chainmodule(struct Ip2NameProcess *Module)
        struct Ip2NameProcess *Chain;
        struct Ip2NameProcess *Last;
 
-       if (debug) debuga(_("Chaining IP resolving module \"%s\"\n"),Module->Name);
+       if (debug) debuga(__FILE__,__LINE__,_("Chaining IP resolving module \"%s\"\n"),Module->Name);
 
        Last=NULL;
        for (Chain=FirstModule ; Chain ; Chain=Chain->Next) {
                if (Chain==Module) {
-                       debuga(_("Ignoring duplicate module \"%s\" to resolve an IP address\n"),Module->Name);
+                       debuga(__FILE__,__LINE__,_("Ignoring duplicate module \"%s\" to resolve an IP address\n"),Module->Name);
                        return;
                }
                Last=Chain;
@@ -106,7 +106,7 @@ static void ip2name_buildmoduleslist(const char *list)
                        }
                }
                if (ModuleIdx>=sizeof(ModulesList)/sizeof(*ModulesList)) {
-                       debuga(_("Unknown module \"%.*s\" to resolve the IP addresses\n"),length,candidate);
+                       debuga(__FILE__,__LINE__,_("Unknown module \"%.*s\" to resolve the IP addresses\n"),length,candidate);
                        exit(EXIT_FAILURE);
                }
                list=candidate+length;
@@ -130,7 +130,7 @@ static void ip2name_configmodule(const char *module)
                        // module found
                        if (ModulesList[ModuleIdx].Process) {
                                if (!ModulesList[ModuleIdx].Process->Configure) {
-                                       debuga(_("No option to configure for module %s\n"),ModulesList[ModuleIdx].Name);
+                                       debuga(__FILE__,__LINE__,_("No option to configure for module %s\n"),ModulesList[ModuleIdx].Name);
                                        exit(EXIT_FAILURE);
                                }
                                while (module[length] && (unsigned char)module[length]<=' ') length++;
@@ -186,7 +186,7 @@ void ip2name_forcedns(void)
                }
        }
        if (!DnsModule) {
-               if (debugz>=LogLevel_Process) debuga(_("No known module to resolve an IP address using the DNS\n"));
+               if (debugz>=LogLevel_Process) debuga(__FILE__,__LINE__,_("No known module to resolve an IP address using the DNS\n"));
                exit(EXIT_FAILURE);
        }
 
@@ -195,7 +195,7 @@ void ip2name_forcedns(void)
        for (Chain=FirstModule ; Chain && Chain!=DnsModule ; Chain=Chain->Next) {
                Last=Chain;
        }
-       if (debug) debuga(_("Chaining IP resolving module \"%s\"\n"),DnsModule->Name);
+       if (debug) debuga(__FILE__,__LINE__,_("Chaining IP resolving module \"%s\"\n"),DnsModule->Name);
        if (Last)
                Last->Next=DnsModule;
        else {
@@ -223,7 +223,7 @@ void ip2name(char *ip,int ip_len)
        if (!KnownIp) {
                KnownIp=Dichotomic_Create();
                if (!KnownIp) {
-                       debuga(_("Not enough memory to store the names corresponding to the IP address\n"));
+                       debuga(__FILE__,__LINE__,_("Not enough memory to store the names corresponding to the IP address\n"));
                        exit(EXIT_FAILURE);
                }
        }
@@ -276,14 +276,14 @@ void name2ip(char *name,int name_size)
        error=getaddrinfo(addr,NULL,NULL,&res);
        if (error) {
                freeaddrinfo(res);
-               debuga(_("Cannot resolve host name %s: %s\n"),name,gai_strerror(error));
+               debuga(__FILE__,__LINE__,_("Cannot resolve host name %s: %s\n"),name,gai_strerror(error));
                exit(EXIT_FAILURE);
        }
        if (res->ai_family==AF_INET) {
                struct sockaddr_in *s4=(struct sockaddr_in *)res->ai_addr;
                struct in_addr *sa=&s4->sin_addr;
                if (res->ai_addrlen<sizeof(*s4)) {
-                       debuga(_("Short structure returned by getaddrinfo for an IPv4 address: %d bytes instead of %d\n"),res->ai_addrlen,(int)sizeof(*s4));
+                       debuga(__FILE__,__LINE__,_("Short structure returned by getaddrinfo for an IPv4 address: %d bytes instead of %d\n"),res->ai_addrlen,(int)sizeof(*s4));
                        exit(EXIT_FAILURE);
                }
                inet_ntop(res->ai_family,sa,name,name_size);
@@ -291,12 +291,12 @@ void name2ip(char *name,int name_size)
                struct sockaddr_in6 *s6=(struct sockaddr_in6 *)res->ai_addr;
                struct in6_addr *sa6=&s6->sin6_addr;
                if (res->ai_addrlen<sizeof(*s6)) {
-                       debuga(_("Short structure returned by getaddrinfo for an IPv6 address: %d bytes instead of %d\n"),res->ai_addrlen,(int)sizeof(*s6));
+                       debuga(__FILE__,__LINE__,_("Short structure returned by getaddrinfo for an IPv6 address: %d bytes instead of %d\n"),res->ai_addrlen,(int)sizeof(*s6));
                        exit(EXIT_FAILURE);
                }
                inet_ntop(res->ai_family,sa6,name,name_size);
        } else {
-               debuga(_("Invalid address type %d returned when resolving host name \"%s\"\n"),res->ai_family,name);
+               debuga(__FILE__,__LINE__,_("Invalid address type %d returned when resolving host name \"%s\"\n"),res->ai_family,name);
        }
        freeaddrinfo(res);
 #else
@@ -320,7 +320,7 @@ void name2ip(char *name,int name_size)
        getword_start(&gwarea,inet_ntoa(ia));
        if (getword(n4,sizeof(n4),&gwarea,'.')<0 || getword(n3,sizeof(n3),&gwarea,'.')<0 ||
            getword(n2,sizeof(n2),&gwarea,'.')<0 || getword(n1,sizeof(n1),&gwarea,0)<0) {
-               printf("SARG: Maybe you have a broken record or garbage in your %s ip address.\n",gwarea.beginning);
+               debuga(__FILE__,__LINE__,_("Invalid IPv4 address \"%s\"\n"),gwarea.beginning);
                exit(EXIT_FAILURE);
        }
        snprintf(name,name_size,"%s.%s.%s.%s",n1,n2,n3,n4);