Remove trailing spaces in every source file

[thirdparty/sarg.git] / userinfo.c

diff --git a/userinfo.c b/userinfo.c
index b76ba1fdb119eca815e52010045e3b60bb41d609..9117a23614e6ae4f5b257742514049f1f7e5de0e 100644 (file)
--- a/userinfo.c
+++ b/userinfo.c
@@ -1,6 +1,6 @@
 /*
  * SARG Squid Analysis Report Generator      http://sarg.sourceforge.net
- *                                                            1998, 2011
+ *                                                            1998, 2012
  *
  * SARG donations:
  *      please look at http://sarg.sourceforge.net/donations.php
@@ -89,8 +89,7 @@ struct userinfostruct *userinfo_create(const char *userid)
        }
        user=group->list+group->nusers++;
 
-       strncpy(user->id,userid,MAX_USER_LEN-1);
-       user->id[MAX_USER_LEN-1]='\0';
+       safe_strcpy(user->id,userid,sizeof(user->id));
 
        if (AnonymousOutputFiles) {
                snprintf(user->filename,sizeof(user->filename),"%d",AnonymousCounter++);
@@ -108,8 +107,9 @@ struct userinfostruct *userinfo_create(const char *userid)
                                }
                        }
                }
+               if (j==0) user->filename[j++]='_'; //don't leave a file name empty
                user->filename[j]='\0';
-               flen=i;
+               flen=i-1;
 
                count=0;
                for (group=first_user_group ; group ; group=group->next) {
@@ -219,3 +219,18 @@ struct userinfostruct *userinfo_advancescan(userscan uscan)
        }
        return(uinfo);
 }
+
+/*!
+Clear the general purpose flag from all the user's info.
+*/
+void userinfo_clearflag(void)
+{
+       struct usergroupstruct *group;
+       int i;
+
+       for (group=first_user_group ; group ; group=group->next) {
+               for (i=0 ; i<group->nusers ; i++)
+                       group->list[i].flag=0;
+       }
+}
+