Ver Fonte

* Remove unneded int idx from stream_writeuserfile() stack

Bryan Drewery há 16 anos atrás
pai
commit
140058387e
3 ficheiros alterados com 5 adições e 5 exclusões
  1. 2 2
      src/mod/share.mod/share.c
  2. 2 2
      src/userrec.c
  3. 1 1
      src/userrec.h

+ 2 - 2
src/mod/share.mod/share.c

@@ -1454,7 +1454,7 @@ static void
 stream_send_users(int idx)
 stream_send_users(int idx)
 {
 {
   bd::Stream stream;
   bd::Stream stream;
-  stream_writeuserfile(stream, userlist, idx);
+  stream_writeuserfile(stream, userlist);
   stream.seek(0, SEEK_SET);
   stream.seek(0, SEEK_SET);
   dprintf(idx, "s ls\n");
   dprintf(idx, "s ls\n");
   bd::String buf;
   bd::String buf;
@@ -1486,7 +1486,7 @@ start_sending_users(int idx)
 
 
   const char salt1[] = SALT1;
   const char salt1[] = SALT1;
   EncryptedStream stream(salt1);
   EncryptedStream stream(salt1);
-  stream_writeuserfile(stream, userlist, idx, old);
+  stream_writeuserfile(stream, userlist, old);
   stream.setFlags(ENC_KEEP_NEWLINES|ENC_AES_256_ECB|ENC_BASE64_BROKEN|ENC_NO_HEADER);
   stream.setFlags(ENC_KEEP_NEWLINES|ENC_AES_256_ECB|ENC_BASE64_BROKEN|ENC_NO_HEADER);
   if (stream.writeFile(share_file)) {
   if (stream.writeFile(share_file)) {
     putlog(LOG_MISC, "*", "ERROR writing user file to transfer.");
     putlog(LOG_MISC, "*", "ERROR writing user file to transfer.");

+ 2 - 2
src/userrec.c

@@ -460,7 +460,7 @@ static void sort_userlist()
   }
   }
 }
 }
 
 
-void stream_writeuserfile(bd::Stream& stream, const struct userrec *bu, int idx, bool old) {
+void stream_writeuserfile(bd::Stream& stream, const struct userrec *bu, bool old) {
   time_t tt = now;
   time_t tt = now;
   char s1[81] = "";
   char s1[81] = "";
   bd::String buf;
   bd::String buf;
@@ -500,7 +500,7 @@ int write_userfile(int idx)
 
 
   const char salt1[] = SALT1;
   const char salt1[] = SALT1;
   EncryptedStream stream(salt1);
   EncryptedStream stream(salt1);
-  stream_writeuserfile(stream, userlist, idx, old);
+  stream_writeuserfile(stream, userlist, old);
   if (stream.writeFile(new_userfile->fd)) {
   if (stream.writeFile(new_userfile->fd)) {
     putlog(LOG_MISC, "*", "ERROR writing user file. (%s)", strerror(errno));
     putlog(LOG_MISC, "*", "ERROR writing user file. (%s)", strerror(errno));
     delete new_userfile;
     delete new_userfile;

+ 1 - 1
src/userrec.h

@@ -15,7 +15,7 @@ int count_users(struct userrec *);
 int deluser(char *);
 int deluser(char *);
 int change_handle(struct userrec *, char *);
 int change_handle(struct userrec *, char *);
 void correct_handle(char *);
 void correct_handle(char *);
-void stream_writeuserfile(bd::Stream&, const struct userrec *, int, bool = 0);
+void stream_writeuserfile(bd::Stream&, const struct userrec *, bool = 0);
 int write_userfile(int);
 int write_userfile(int);
 void touch_laston(struct userrec *, char *, time_t);
 void touch_laston(struct userrec *, char *, time_t);
 void user_del_chan(char *);
 void user_del_chan(char *);