]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
Remove trailing spaces in every source file
authorFrédéric Marchal <fmarchal@users.sourceforge.net>
Sun, 26 Aug 2012 17:35:01 +0000 (19:35 +0200)
committerFrédéric Marchal <fmarchal@users.sourceforge.net>
Sun, 26 Aug 2012 17:35:01 +0000 (19:35 +0200)
16 files changed:
authfail.c
css.c
denied.c
dichotomic.c
download.c
ip2name.c
ip2name_exec.c
readlog_squid.c
realtime.c
redirector.c
report.c
siteuser.c
topuser.c
totday.c
url.c
util.c

index 5250796db4bf0492a521d2b741c75f9bb1fc9e1d..26fc449ca855c173e5df4b1abb244aa4f96b822d 100644 (file)
@@ -50,7 +50,7 @@ void authfail_open(void)
                if (debugz) debugaz(_("Authentication failure report not produced because privacy option is active\n"));
                return;
        }
-       
+
        snprintf(authfail_unsort,sizeof(authfail_unsort),"%s/authfail.int_unsort",tmp);
        if ((fp_authfail=MY_FOPEN(authfail_unsort,"w"))==NULL) {
                debuga(_("(log) Cannot open file: %s - %s\n"),authfail_unsort,strerror(errno));
@@ -67,7 +67,7 @@ Write one entry in the unsorted authentication file file provided that it is req
 void authfail_write(const struct ReadLogStruct *log_entry)
 {
        char date[80];
-       
+
        if (fp_authfail && (strstr(log_entry->HttpCode,"DENIED/401") != 0 || strstr(log_entry->HttpCode,"DENIED/407") != 0)) {
                strftime(date,sizeof(date),"%d/%m/%Y\t%H:%M:%S",&log_entry->EntryTime);
                fprintf(fp_authfail, "%s\t%s\t%s\t%s\n",date,log_entry->User,log_entry->Ip,log_entry->Url);
diff --git a/css.c b/css.c
index ecfe09db87801eec099f1c5eb6d123e76288404a..34793fb78a5f58a0cf4970176dcb810c8e455ac3 100644 (file)
--- a/css.c
+++ b/css.c
@@ -67,7 +67,7 @@ void css_content(FILE *fp_css)
        fprintf(fp_css,".link a:link,a:visited {font-family:%s;font-size:%s;color:#0000FF;text-decoration:none;}\n", FontFace, FontSize);
 
        fprintf(fp_css,"a > img {border:none;}\n");
-       
+
        fputs(".warn {margin:0.5em;}\n",fp_css);
        fprintf(fp_css,".warn > span {padding:0.5em;border:2px solid black;background-color:orange;font-family:%s;font-size:%s;}\n",FontFace,FontSize);
 
index 67fd1774aeb1bb563343ff191fd1fea24e3bf094..08a09134b2842016dc51faacb2cfe8af66d157d4 100644 (file)
--- a/denied.c
+++ b/denied.c
@@ -50,7 +50,7 @@ void denied_open(void)
                if (debugz) debugaz(_("Denied report not produced because privacy option is active\n"));
                return;
        }
-       
+
        snprintf(denied_unsort,sizeof(denied_unsort),"%s/denied.int_unsort",tmp);
        if ((fp_denied=MY_FOPEN(denied_unsort,"w"))==NULL) {
                debuga(_("(log) Cannot open file: %s - %s\n"),denied_unsort,strerror(errno));
@@ -67,7 +67,7 @@ Write one entry in the unsorted denied file provided that it is required.
 void denied_write(const struct ReadLogStruct *log_entry)
 {
        char date[80];
-       
+
        if (fp_denied && strstr(log_entry->HttpCode,"DENIED/403") != 0) {
                strftime(date,sizeof(date),"%d/%m/%Y\t%H:%M:%S",&log_entry->EntryTime);
                fprintf(fp_denied, "%s\t%s\t%s\t%s\n",date,log_entry->User,log_entry->Ip,log_entry->Url);
index b58f0ca8c96716f7398de918816c71cc4493308a..0d3fee7acf4b38310e072faa04e2b870c5b24818 100644 (file)
@@ -61,7 +61,7 @@ to Dichotomic_Destroy().
 DichotomicObject Dichotomic_Create(void)
 {
        DichotomicObject Obj;
-       
+
        Obj=malloc(sizeof(*Obj));
        if (!Obj)
        {
@@ -83,7 +83,7 @@ void Dichotomic_Destroy(DichotomicObject *ObjPtr)
 {
        DichotomicObject Obj;
        int i;
-       
+
        if (!ObjPtr || !*ObjPtr) return;
        Obj=*ObjPtr;
        *ObjPtr=NULL;
@@ -104,7 +104,7 @@ static int Dichotomic_FindKeyPos(DichotomicObject Obj,const char *key,bool *Foun
        int down,up;
        int middle=0;
        int cmp=0;
-       
+
        down=0;
        up=Obj->NItems-1;
        while (up>=down)
@@ -141,7 +141,7 @@ bool Dichotomic_Insert(DichotomicObject Obj,const char *key, const char *value)
        int Position;
        bool Found;
        int i;
-       
+
        if (!Obj) return(false);
        if (Obj->Items)
        {
@@ -150,7 +150,7 @@ bool Dichotomic_Insert(DichotomicObject Obj,const char *key, const char *value)
        }
        else
                Position=0;
-       
+
        if (Obj->NItems>=Obj->NAllocated)
        {
                struct DichotomicItemStruct *Items;
@@ -163,7 +163,7 @@ bool Dichotomic_Insert(DichotomicObject Obj,const char *key, const char *value)
                }
                Obj->Items=Items;
        }
-       
+
        for (i=Obj->NItems ; i>Position ; i--)
        {
                Obj->Items[i].Key=Obj->Items[i-1].Key;
@@ -177,7 +177,7 @@ bool Dichotomic_Insert(DichotomicObject Obj,const char *key, const char *value)
                exit(EXIT_FAILURE);
        }
        Obj->NItems++;
-       
+
        return(true);
 }
 
@@ -193,7 +193,7 @@ const char *Dichotomic_Search(DichotomicObject Obj,const char *key)
 {
        int Position;
        bool Found;
-       
+
        if (!Obj) return(NULL);
        if (Obj->NItems==0 || !Obj->Items) return(NULL);
        Position=Dichotomic_FindKeyPos(Obj,key,&Found);
index d914782de8fa4f82346e2a30eca14b1223ba01a0..0da4e5cf60f695e6390b6112248253f463acfae0 100644 (file)
@@ -58,7 +58,7 @@ static void download_sort(const char *report_in)
        int clen;
        char csort[MAXLEN];
        int cstatus;
-       
+
        clen=snprintf(csort,sizeof(csort),"sort -T \"%s\" -t \"\t\" -k 3,3 -k 1,1 -k 2,2 -k 5,5 -o \"%s\" \"%s/download.int_unsort\"",
                        tmp, report_in, tmp);
        if (clen>=sizeof(csort)) {
index 3f6b3e5175ec88f1a009b4d2f845cb295d1ae6b3..e06179b88812fad3bd5ec72a1e447e149a1f5101 100644 (file)
--- a/ip2name.c
+++ b/ip2name.c
@@ -62,9 +62,9 @@ static void ip2name_chainmodule(struct Ip2NameProcess *Module)
 {
        struct Ip2NameProcess *Chain;
        struct Ip2NameProcess *Last;
-       
+
        if (debug) debuga(_("Chaining IP resolving module \"%s\"\n"),Module->Name);
-       
+
        Last=NULL;
        for (Chain=FirstModule ; Chain ; Chain=Chain->Next) {
                if (Chain==Module) {
@@ -73,7 +73,7 @@ static void ip2name_chainmodule(struct Ip2NameProcess *Module)
                }
                Last=Chain;
        }
-       
+
        if (Last)
                Last->Next=Module;
        else {
@@ -92,7 +92,7 @@ static void ip2name_buildmoduleslist(const char *list)
        const char *candidate;
        int length;
        int ModuleIdx;
-       
+
        while (*list) {
                candidate=list;
                while (*candidate && (unsigned char)*candidate<=' ') candidate++;
@@ -123,7 +123,7 @@ static void ip2name_configmodule(const char *module)
 {
        int length;
        unsigned int ModuleIdx;
-       
+
        for (length=0 ; module[length] && (unsigned char)module[length]>' ' ; length++);
        for (ModuleIdx=0 ; ModuleIdx<sizeof(ModulesList)/sizeof(*ModulesList) ; ModuleIdx++) {
                if (strncasecmp(module,ModulesList[ModuleIdx].Name,length)==0 && ModulesList[ModuleIdx].Name[length]=='\0') {
@@ -157,13 +157,13 @@ int ip2name_config(const char *param)
                ip2name_buildmoduleslist(param);
                return(1);
        }
-       
+
        // parameter for a module?
        if (*param=='_') {
                ip2name_configmodule(param+1);
                return(1);
        }
-       
+
        return(0);
 }
 
@@ -176,7 +176,7 @@ void ip2name_forcedns(void)
        int i;
        struct Ip2NameProcess *Chain;
        struct Ip2NameProcess *Last;
-       
+
        // find the dns module
        for (i=0 ; i<sizeof(ModulesList)/sizeof(*ModulesList) ; i++) {
                if (strcmp("dns",ModulesList[i].Name)==0) {
@@ -189,7 +189,7 @@ void ip2name_forcedns(void)
                if (debugz) debuga(_("No known module to resolve an IP address using the DNS\n"));
                exit(EXIT_FAILURE);
        }
-       
+
        // add the module to the list if it isn't there yet
        Last=NULL;
        for (Chain=FirstModule ; Chain && Chain!=DnsModule ; Chain=Chain->Next) {
@@ -219,7 +219,7 @@ void ip2name(char *ip,int ip_len)
        enum ip2name_retcode Status;
        const char *Name;
        char OrigIp[80];
-       
+
        if (!KnownIp) {
                KnownIp=Dichotomic_Create();
                if (!KnownIp) {
@@ -227,13 +227,13 @@ void ip2name(char *ip,int ip_len)
                        exit(EXIT_FAILURE);
                }
        }
-       
+
        Name=Dichotomic_Search(KnownIp,ip);
        if (Name) {
                safe_strcpy(ip,Name,ip_len);
                return;
        }
-       
+
        safe_strcpy(OrigIp,ip,sizeof(OrigIp));
        for (Module=FirstModule ; Module ; Module=Module->Next) {
                if (Module->Resolve) {
index 30b237a6f497fb3d8778549272c8981a260ab771..b9fcbddd700b3b41c363891b1956f811f2d9db56 100644 (file)
@@ -55,7 +55,7 @@ file.
 static void ip2name_execconfig(const char *name,const char *param)
 {
        int len;
-       
+
        len=strlen(param);
        if (len>=sizeof(ExecCmd)) {
                debuga(_("Command to execute to resolve the IP addresses is too long (maximum is %d bytes)\n"),(int)sizeof(ExecCmd));
@@ -81,12 +81,12 @@ static enum ip2name_retcode ip2name_exec(char *ip,int ip_len)
        FILE *cmd_in;
        char buffer[512];
        size_t nread;
-       
+
        if (ExecCmd[0]=='\0') {
                debuga(_("No command to run to resolve an IP address. Please configure it in sarg.conf\n"));
                exit(EXIT_FAILURE);
        }
-       
+
        j=0;
        len=strlen(ip);
        for (i=0 ; i<sizeof(ExecCmd) && ExecCmd[i] ; i++) {
@@ -107,22 +107,22 @@ static enum ip2name_retcode ip2name_exec(char *ip,int ip_len)
                }
        }
        cmd[j]='\0';
-       
+
        cmd_in=popen(cmd,"r");
        if (!cmd_in) {
                debuga(_("Cannot run command %s\n"),cmd);
                exit(EXIT_FAILURE);
        }
-       
+
        nread=fread(buffer,1,sizeof(buffer),cmd_in);
-       
+
        if (pclose(cmd_in)==-1) {
                debuga(_("Command failed: %s\n"),cmd);
                exit(EXIT_FAILURE);
        }
 
        if (nread==0) return(INRC_NotFound);
-       
+
        safe_strcpy(ip,buffer,ip_len);
        return(INRC_Found);
 }
index a7ac4b7191ad64fd55c5a15e1cbb1d27f2a55f16..6717198b09b1163ce5d475cec7f2ffaa9a2ad21c 100644 (file)
@@ -53,22 +53,22 @@ static enum ReadLogReturnCodeEnum Squid_ReadEntry(char *Line,struct ReadLogStruc
        int UrlLen;
        int UserLen;
        struct tm *tt;
-       
+
        // get log time.
        Begin=Line;
        log_time=0;
        while (isdigit(*Line)) log_time=log_time*10+(*Line++-'0');
        if (*Line!='.' || Line==Begin) return(RLRC_Unknown);
-       
+
        // ignore decimal part to log time.
        Begin=++Line;
        while (isdigit(*Line)) Line++;
        if (*Line!=' ' || Line==Begin) return(RLRC_Unknown);
-       
+
        // skip spaces before the elapsed time.
        while (*Line==' ') Line++;
        if (!isdigit(*Line)) return(RLRC_Unknown);
-       
+
        // get the elapsed time.
        Begin=Line;
        Entry->ElapsedTime=0L;
@@ -90,22 +90,22 @@ static enum ReadLogReturnCodeEnum Squid_ReadEntry(char *Line,struct ReadLogStruc
        Entry->DataSize=0LL;
        while (isdigit(*Line)) Entry->DataSize=Entry->DataSize*10+(*Line++-'0');
        if (*Line!=' ' || Begin==Line) return(RLRC_Unknown);
-       
+
        // skip the HTTP function
        Begin=++Line;
        while (*Line && *Line!=' ') Line++;
        if (*Line!=' '|| Line==Begin) return(RLRC_Unknown);
-       
+
        // the url
        Entry->Url=++Line;
        for (UrlLen=0 ; *Line && *Line!=' ' ; UrlLen++) Line++;
        if (*Line!=' ' || UrlLen==0) return(RLRC_Unknown);
-       
+
        // the ID of the user or - if the user is unidentified
        Entry->User=++Line;
        for (UserLen=0 ; *Line && *Line!=' ' ; UserLen++) Line++;
        if (*Line!=' ' || UserLen==0) return(RLRC_Unknown);
-       
+
        // now, the format is known with a good confidence. If the time doesn't decode, it is an error.
        tt=localtime(&log_time);
        if (tt==NULL) {
@@ -113,13 +113,13 @@ static enum ReadLogReturnCodeEnum Squid_ReadEntry(char *Line,struct ReadLogStruc
                return(RLRC_InternalError);
        }
        memcpy(&Entry->EntryTime,tt,sizeof(struct tm));
-       
+
        // it is safe to alter the line buffer now that we are returning a valid entry
        Entry->Ip[IpLen]='\0';
        Entry->HttpCode[HttpCodeLen]='\0';
        Entry->Url[UrlLen]='\0';
        Entry->User[UserLen]='\0';
-       
+
        return(RLRC_NoError);
 }
 
index 43f8110aeabd4761fc1465a83bb72550d9f8caea..373f61e13ed86a9afd0d4faef09516a98eea1209 100755 (executable)
@@ -268,7 +268,7 @@ static void datashow(const char *tmp)
                        strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M", t);
                else if (df=='e')
                        strftime(tbuf, sizeof(tbuf), "%d-%m-%Y %H:%M", t);
-               
+
                printf("<tr><td class=\"data\">%s</td><td class=\"data3\">%s</td><td class=\"data3\">%s</td><td class=\"data3\">%s</td><td class=\"data2\"><a href=\"http://%s\">%s</td></tr>\n",tbuf,ip,name,typ,url,url);
                strcpy(ouser,user);
 
index 14643b1d98031d7b4fd353d0bb7a8b8da8666c43..d52c05dd9d9ebbcd3760fbbca09886e344f6d407 100644 (file)
@@ -562,14 +562,14 @@ void redirector_report(void)
                show_ignored_redirector(fp_ou,count-SquidGuardReportLimit);
 
        fputs("</table>\n",fp_ou);
-       
+
        if (RedirectorErrors>0)
        {
                fputs("<div class=\"warn\"><span>",fp_ou);
                fprintf(fp_ou,ngettext("%d error found in the log file. Some entries may be missing.","%d errors found in the log file. Some entries may be missing.",RedirectorErrors),RedirectorErrors);
                fputs("</span></div>\n",fp_ou);
        }
-       
+
        fputs("</div>\n",fp_ou);
        if (write_html_trailer(fp_ou)<0)
                debuga(_("Write error in file %s\n"),report);
index 0ff997b9276a9914e40e504dd3b417300bdb52fb..67bc5f903cb0e656fbe2d837bbf725e7585ca551 100644 (file)
--- a/report.c
+++ b/report.c
@@ -110,7 +110,7 @@ void gerarel(void)
                daystat=NULL;
        else
                daystat=day_prepare();
-       
+
        uscan=userinfo_startscan();
        if (uscan == NULL) {
                debuga(_("Cannot enumerate the user list\n"));
@@ -371,7 +371,7 @@ void gerarel(void)
                                siteuser();
                        else if (debugz)
                                debugaz(_("Sites & users report not requested in report_type\n"));
-                       
+
                        if ((ReportType & REPORT_TYPE_DENIED) != 0)
                                gen_denied_report();
                        else if (debugz)
index 2780431cb3dfeb4c5aa2a1df0ab34d0d738fad15..58d195fef96448988db014e79c0c23f59da81e75 100644 (file)
@@ -141,7 +141,7 @@ void siteuser(void)
                                }
                        }
                        strcpy(ourl,item.url);
-                       
+
                        if(BlockIt[0]!='\0' && ourl[0]!=ALIAS_PREFIX) {
                                fprintf(fp_ou,"<a href=\"%s%s?url=",wwwDocumentRoot,BlockIt);
                                output_html_url(fp_ou,ourl);
index bb489d0e3589b00561bafdfe3aa81e1c4cf1acf5..2423a1f0b2d85c18ba3db77263e23640cef5853f 100644 (file)
--- a/topuser.c
+++ b/topuser.c
@@ -40,7 +40,7 @@ static void set_total_users(int totuser)
 {
        char tusr[1024];
        FILE *fp_ou;
-       
+
        snprintf(tusr,sizeof(tusr),"%s/sarg-users",outdirname);
        if((fp_ou=fopen(tusr,"w"))==NULL) {
                debuga(_("(topuser) Cannot open file %s\n"),tusr);
index aeea8dd72174fad031cef11e221f939acc131b29..8b5f93bccde780ee9db2f245e8bf8a0408388d15 100644 (file)
--- a/totday.c
+++ b/totday.c
@@ -46,14 +46,14 @@ The object must be freed with a call to day_cleanup().
 DayObject day_prepare(void)
 {
        DayObject ddata;
-       
+
        ddata=(DayObject)malloc(sizeof(*ddata));
        if (!ddata)
        {
                debuga(_("Not enough memory to store the daily statistics\n"));
                exit(EXIT_FAILURE);
        }
-       
+
        return(ddata);
 }
 
diff --git a/url.c b/url.c
index 1a43ec3cb277d6c66acf08cdfa4321b88fde388f..62ecc4c4cd0992464eb93be389689c7399c5a353 100644 (file)
--- a/url.c
+++ b/url.c
@@ -202,7 +202,7 @@ static int Alias_StoreName(const char *name,const char *next)
                tmp[len]='\0';
                NameEnd=tmp;
        }
-       
+
        // ignore duplicates
        prev_alias=NULL;
        for (alias=FirstAliasName ; alias ; alias=alias->Next) {
@@ -264,7 +264,7 @@ static int Alias_StoreName(const char *name,const char *next)
                }
                new_alias->Alias=tmp;
        }
-               
+
        new_alias->Next=NULL;
        if (prev_alias)
                prev_alias->Next=new_alias;
@@ -344,7 +344,7 @@ static int Alias_StoreIpv4(unsigned char *ipv4,int nbits,const char *next)
                sprintf(tmp,"%c%d.%d.%d.%d/%d",ALIAS_PREFIX,ipv4[0],ipv4[1],ipv4[2],ipv4[3],nbits);
                new_alias->Alias=tmp;
        }
-               
+
        if (prev_alias) {
                new_alias->Next=prev_alias->Next;
                prev_alias->Next=new_alias;
@@ -426,7 +426,7 @@ static int Alias_StoreIpv6(unsigned short *ipv6,int nbits,const char *next)
                sprintf(tmp,"%c%x:%x:%x:%x:%x:%x:%x:%x/%d",ALIAS_PREFIX,ipv6[0],ipv6[1],ipv6[2],ipv6[3],ipv6[4],ipv6[5],ipv6[6],ipv6[7],nbits);
                new_alias->Alias=tmp;
        }
-               
+
        if (prev_alias) {
                new_alias->Next=prev_alias->Next;
                prev_alias->Next=new_alias;
@@ -458,7 +458,7 @@ static int Alias_StoreRegexp(char *buf)
        int len;
        char *tmp;
        int i;
-       
+
        // find the pattern
        Delimiter=*buf++;
        for (End=buf ; *End && *End!=Delimiter ; End++) {
@@ -475,12 +475,12 @@ static int Alias_StoreRegexp(char *buf)
                return(-1);
        }
        *End++='\0';
-       
+
        // find the alias
        for (Replace=End ; *Replace==' ' || *Replace=='\t' ; Replace++);
        for (End=Replace ; *End && (unsigned char)*End>' ' ; End++);
        *End='\0';
-               
+
        // store it
        new_alias=malloc(sizeof(*new_alias));
        if (!new_alias) {
@@ -505,7 +505,7 @@ static int Alias_StoreRegexp(char *buf)
        memcpy(tmp+1,Replace,len);
        tmp[len+1]='\0';
        new_alias->Alias=tmp;
-       
+
        new_alias->SubPartern=false;
        for (i=1 ; tmp[i] ; i++)
                // both the sed \1 and the perl $1 replacement operators are accepted
@@ -513,13 +513,13 @@ static int Alias_StoreRegexp(char *buf)
                        new_alias->SubPartern=true;
                        break;
                }
-       
+
        // chain it
        prev_alias=&FirstAliasRe;
        for (alias=FirstAliasRe ; alias ; alias=alias->Next)
                prev_alias=&alias->Next;
        *prev_alias=new_alias;
-               
+
        return(1);
 }
 #endif
@@ -541,7 +541,7 @@ static int Alias_Store(char *buf)
        int nbits;
        const char *next;
        int Error;
-       
+
        if (strncasecmp(buf,"re:",3)==0) {
 #ifdef USE_PCRE
                if (Alias_StoreRegexp(buf+3)<0)
@@ -585,7 +585,7 @@ void read_hostalias(const char *Filename)
                debuga(_("Cannot read host name alias file \"%s\" - %s\n"),Filename,strerror(errno));
                exit(EXIT_FAILURE);
        }
-       
+
        if ((line=longline_create())==NULL) {
                debuga(_("Not enough memory to read the host name aliases\n"));
                exit(EXIT_FAILURE);
@@ -597,10 +597,10 @@ void read_hostalias(const char *Filename)
                        exit(EXIT_FAILURE);
                }
        }
-       
+
        longline_destroy(&line);
        fclose(fi);
-       
+
        if (debug) {
                struct hostalias_name *alias1;
                struct hostalias_ipv4 *alias4;
@@ -633,7 +633,7 @@ void free_hostalias(void)
        {
                struct hostalias_name *alias1;
                struct hostalias_name *next1;
-               
+
                for (alias1=FirstAliasName ; alias1 ; alias1=next1) {
                        next1=alias1->Next;
                        if (alias1->HostName_Prefix) free((void *)alias1->HostName_Prefix);
@@ -646,7 +646,7 @@ void free_hostalias(void)
        {
                struct hostalias_ipv4 *alias4;
                struct hostalias_ipv4 *next4;
-               
+
                for (alias4=FirstAliasIpv4 ; alias4 ; alias4=next4) {
                        next4=alias4->Next;
                        free((void *)alias4->Alias);
@@ -657,7 +657,7 @@ void free_hostalias(void)
        {
                struct hostalias_ipv6 *alias6;
                struct hostalias_ipv6 *next6;
-               
+
                for (alias6=FirstAliasIpv6 ; alias6 ; alias6=next6) {
                        next6=alias6->Next;
                        free((void *)alias6->Alias);
@@ -669,7 +669,7 @@ void free_hostalias(void)
        {
                struct hostalias_regex *alias;
                struct hostalias_regex *next;
-               
+
                for (alias=FirstAliasRe ; alias ; alias=next) {
                        next=alias->Next;
                        pcre_free(alias->Re);
@@ -728,7 +728,7 @@ static const char *alias_url_ipv4(const char *url,unsigned char *ipv4)
        int len;
 
        for (alias=FirstAliasIpv4 ; alias ; alias=alias->Next) {
-               len=alias->NBits;       
+               len=alias->NBits;
                if ((len<8 || memcmp(ipv4,alias->Ip,len/8)==0) && ((len%8)==0 || (ipv4[len/8] ^ alias->Ip[len/8]) & (0xFFU<<(8-len%8)))==0) {
                        return(alias->Alias);
                }
@@ -837,7 +837,7 @@ Find the beginning of the URL beyond the scheme://
 const char *skip_scheme(const char *url)
 {
        const char *str;
-       
+
        /*
        Skip any scheme:// at the beginning of the URL (see rfc2396 section 3.1).
        The underscore is not part of the standard but is found in the squid logs as cache_object://.
diff --git a/util.c b/util.c
index 70cba41cc2e03a8832c44451f173dffdcc979f51..5e5b885f71f2fa52fe99982daa481fa9a1e2d977 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1964,7 +1964,7 @@ void emptytmpdir(const char *dir)
 
        dirp=opendir(dir);
        if (!dirp) return;
-       
+
        // make sure the temporary directory contains only our files
        while ((direntp = readdir(dirp)) != NULL) {
                if (direntp->d_name[0] == '.' && (direntp->d_name[1] == '\0' ||
@@ -1983,12 +1983,12 @@ void emptytmpdir(const char *dir)
                        "directory or manually delete the content of \"%s\"\n"),direntp->d_name,dir,dir);
                        exit(EXIT_FAILURE);
                }
-               
+
                if (snprintf(dname,sizeof(dname),"%s/%s",dir,direntp->d_name)>=sizeof(dname)) {
                        debuga(_("directory name to delete too long: %s/%s\n"),dir,direntp->d_name);
                        exit(EXIT_FAILURE);
                }
-               
+
 #ifdef HAVE_LSTAT
                err=lstat(dname,&st);
 #else
@@ -2025,7 +2025,7 @@ void emptytmpdir(const char *dir)
                        "directory or manually delete the content of \"%s\"\n"),direntp->d_name,dir,dir);
                        exit(EXIT_FAILURE);
                }
-               
+
                if (snprintf(dname,sizeof(dname),"%s/%s",dir,direntp->d_name)>=sizeof(dname)) {
                        debuga(_("directory name to delete too long: %s/%s\n"),dir,direntp->d_name);
                        exit(EXIT_FAILURE);
@@ -2086,7 +2086,7 @@ int extract_address_mask(const char *buf,const char **text,unsigned char *ipv4,u
 
        // skip leading spaces and tabs
        while (*buf && (*buf==' ' || *buf=='\t')) buf++;
-       
+
        // find out the nature of the pattern
        ip_size=0x60  | 0x04;
        if (*buf=='[') {