fix indentation

[irc/quakenet/newserv.git] / chanserv / chanservdb_updates.c

diff --git a/chanserv/chanservdb_updates.c b/chanserv/chanservdb_updates.c
index a266b077d7991d95c9ee88dcf44175741e3d4afe..43de9571e6dc460004aaaa0f5389bb8cc2c07bff 100644 (file)
--- a/chanserv/chanservdb_updates.c
+++ b/chanserv/chanservdb_updates.c
@@ -83,13 +83,13 @@ void csdb_updatechannel(regchan *rcp) {
                  "addedby=%u, suspendby=%u, suspendtime=%lu, chantype=%d, totaljoins=%u,"
                  "tripjoins=%u, maxusers=%u, tripusers=%u,"
                  "welcome='%s', topic='%s', chankey='%s', suspendreason='%s',"
-                 "comment='%s', lasttimestamp=%d WHERE ID=%u",escname,rcp->flags,rcp->forcemodes,
+                 "comment='%s', lasttimestamp=%jd WHERE ID=%u",escname,rcp->flags,rcp->forcemodes,
                  rcp->denymodes,rcp->limit,rcp->autolimit, rcp->banstyle,
                  rcp->lastactive,rcp->statsreset,rcp->banduration,
                  rcp->founder, rcp->addedby, rcp->suspendby, rcp->suspendtime,
                  rcp->chantype,rcp->totaljoins,rcp->tripjoins,
                  rcp->maxusers,rcp->tripusers,
-                 escwelcome,esctopic,esckey,escreason,esccomment,rcp->ltimestamp,rcp->ID);
+                 escwelcome,esctopic,esckey,escreason,esccomment,(intmax_t)rcp->ltimestamp,rcp->ID);
 }
 
 void csdb_updatechannelcounters(regchan *rcp) {
@@ -105,8 +105,8 @@ void csdb_updatechannelcounters(regchan *rcp) {
 
 void csdb_updatechanneltimestamp(regchan *rcp) {
   dbquery("UPDATE chanserv.channels SET "
-                 "lasttimestamp=%u WHERE ID=%u",
-                 rcp->ltimestamp, rcp->ID);
+                 "lasttimestamp=%jd WHERE ID=%u",
+                 (intmax_t)rcp->ltimestamp, rcp->ID);
 }
 
 void csdb_createchannel(regchan *rcp) {
@@ -152,14 +152,14 @@ void csdb_createchannel(regchan *rcp) {
                  "banduration, founder, addedby, suspendby, suspendtime, chantype, totaljoins, tripjoins,"
                  "maxusers, tripusers, welcome, topic, chankey, suspendreason, "
                  "comment, lasttimestamp) VALUES (%u,'%s',%d,%d,%d,%d,%d,%d,%lu,%lu,%lu,%lu,%u,"
-                 "%u,%u,%lu,%d,%u,%u,%u,%u,'%s','%s','%s','%s','%s',%d)",
+                 "%u,%u,%lu,%d,%u,%u,%u,%u,'%s','%s','%s','%s','%s',%jd)",
                  rcp->ID, escname, rcp->flags,rcp->forcemodes,
                  rcp->denymodes,rcp->limit,rcp->autolimit, rcp->banstyle, rcp->created, 
                  rcp->lastactive,rcp->statsreset,rcp->banduration,
                  rcp->founder, rcp->addedby, rcp->suspendby, rcp->suspendtime,
                  rcp->chantype,rcp->totaljoins,rcp->tripjoins,
                  rcp->maxusers,rcp->tripusers,
-                 escwelcome,esctopic,esckey,escreason,esccomment,rcp->ltimestamp);
+                 escwelcome,esctopic,esckey,escreason,esccomment,(intmax_t)rcp->ltimestamp);
 }
 
 void csdb_deletechannel(regchan *rcp) {
@@ -388,41 +388,38 @@ void csdb_chanlevhistory_insert(regchan *rcp, nick *np, reguser *trup, flag_t ol
     oldflags, newflags);
 }
 
-void csdb_accounthistory_insert(nick *np, char *oldpass, char *newpass, sstring *oldemail, sstring *newemail) {
+void csdb_accounthistory_insert(nick *np, char *oldpass, char *newpass, char *oldemail, char *newemail) {
   reguser *rup=getreguserfromnick(np);
-  char escoldpass[30];
-  char escnewpass[30];
-  char escoldemail[130];
-  char escnewemail[130];
+  char escoldpass[PASSLEN*2+5];
+  char escnewpass[PASSLEN*2+5];
+  char escoldemail[EMAILLEN*2+5];
+  char escnewemail[EMAILLEN*2+5];
 
   if (!rup || UHasOperPriv(rup))
     return;
 
   if (oldpass)
-    dbescapestring(escoldpass, oldpass, strlen(oldpass));
+    dbescapestring(escoldpass, oldpass, CSMIN(strlen(oldpass), PASSLEN));
   else
     escoldpass[0]='\0';
 
   if (newpass)
-    dbescapestring(escnewpass, newpass, strlen(newpass));
+    dbescapestring(escnewpass, newpass, CSMIN(strlen(newpass), PASSLEN));
   else
     escnewpass[0]='\0';
 
   if (oldemail)
-    dbescapestring(escoldemail, oldemail->content, oldemail->length);
+    dbescapestring(escoldemail, oldemail, CSMIN(strlen(oldemail), EMAILLEN));
   else
     escoldemail[0]='\0';
   if (newemail)
-    dbescapestring(escnewemail, newemail->content, newemail->length);
+    dbescapestring(escnewemail, newemail, CSMIN(strlen(newemail), EMAILLEN));
   else
     escnewemail[0]='\0';
 
   dbquery("INSERT INTO chanserv.accounthistory (userID, changetime, authtime, oldpassword, newpassword, oldemail, "
     "newemail) VALUES (%u, %lu, %lu, '%s', '%s', '%s', '%s')", rup->ID, getnettime(), np->accountts, escoldpass, escnewpass,
     escoldemail, escnewemail);
-
-  if (newemail)
-    freesstring(newemail);
 }
 
 void csdb_cleanuphistories() {
@@ -448,8 +445,8 @@ void csdb_createmaillock(maillock *mlp) {
   else
     escreason[0]='\0';
 
-  dbquery("INSERT INTO chanserv.maillocks (id, pattern, reason, createdby, created) VALUES(%u, '%s', '%s', %u, %u)",
-          mlp->id,escpattern,escreason,mlp->createdby,mlp->created);
+  dbquery("INSERT INTO chanserv.maillocks (id, pattern, reason, createdby, created) VALUES(%u, '%s', '%s', %u, %jd)",
+          mlp->id,escpattern,escreason,mlp->createdby,(intmax_t)mlp->created);
 }
 
 void csdb_updatemaillock(maillock *mlp) {
@@ -462,6 +459,6 @@ void csdb_updatemaillock(maillock *mlp) {
   else
     escreason[0]='\0';
 
-  dbquery("UPDATE chanserv.maillocks SET pattern='%s', reason='%s', createdby=%u, created=%u WHERE ID=%u", escpattern, escreason, mlp->createdby, mlp->created, mlp->id);
+  dbquery("UPDATE chanserv.maillocks SET pattern='%s', reason='%s', createdby=%u, created=%jd WHERE ID=%u", escpattern, escreason, mlp->createdby, (intmax_t)mlp->created, mlp->id);
 }