[srvx-commits] CVS: services/src proto-p10.c,1.61,1.62 proto-bahamut.c,1.35,1.36

[Zoot <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv12464/src

Modified Files:
	proto-p10.c proto-bahamut.c 
Log Message:
When deleting users, remember to free the memory allocated for their nicks.


Index: proto-p10.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-p10.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** proto-p10.c	31 Jan 2003 22:34:49 -0000	1.61
--- proto-p10.c	28 Feb 2003 17:17:56 -0000	1.62
***************
*** 1321,1324 ****
--- 1321,1331 ----
  static unsigned int of_size = 0, of_used = 0;
  
+ void
+ free_user(struct userNode *user)
+ {
+     free(user->nick);
+     free(user);
+ }
+ 
  static void
  parse_cleanup(void)
***************
*** 1330,1334 ****
      free(mcf_list);
      dict_delete(irc_func_dict);
!     for (nn=0; nn<dead_users.used; nn++) free(dead_users.list[nn]);
      userList_clean(&dead_users);
  }
--- 1337,1341 ----
      free(mcf_list);
      dict_delete(irc_func_dict);
!     for (nn=0; nn<dead_users.used; nn++) free_user(dead_users.list[nn]);
      userList_clean(&dead_users);
  }
***************
*** 1518,1522 ****
          unsigned int i;
          for (i=0; i<dead_users.used; i++) {
!             free(dead_users.list[i]);
          }
          dead_users.used = 0;
--- 1525,1529 ----
          unsigned int i;
          for (i=0; i<dead_users.used; i++) {
!             free_user(dead_users.list[i]);
          }
          dead_users.used = 0;
***************
*** 1867,1871 ****
          userList_append(&dead_users, user);
      } else {
!         free(user);
      }
  }
--- 1874,1878 ----
          userList_append(&dead_users, user);
      } else {
!         free_user(user);
      }
  }

Index: proto-bahamut.c
===================================================================
RCS file: /cvsroot/srvx/services/src/proto-bahamut.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** proto-bahamut.c	21 Jan 2003 00:56:20 -0000	1.35
--- proto-bahamut.c	28 Feb 2003 17:17:57 -0000	1.36
***************
*** 192,195 ****
--- 192,202 ----
  
  void
+ free_user(struct userNode *user)
+ {
+     free(user->nick);
+     free(user);
+ }
+ 
+ void
  DelUser(struct userNode* user, struct userNode *killer, int announce, const char *why) {
      unsigned int nn;
***************
*** 217,221 ****
          userList_append(&dead_users, user);
      } else {
!         free(user);
      }
  }
--- 224,228 ----
          userList_append(&dead_users, user);
      } else {
!         free_user(user);
      }
  }
***************
*** 938,942 ****
      if (of_list) free(of_list);
      dict_delete(irc_func_dict);
!     for (nn=0; nn<dead_users.used; nn++) free(dead_users.list[nn]);
      userList_clean(&dead_users);
  }
--- 945,949 ----
      if (of_list) free(of_list);
      dict_delete(irc_func_dict);
!     for (nn=0; nn<dead_users.used; nn++) free_user(dead_users.list[nn]);
      userList_clean(&dead_users);
  }
***************
*** 1022,1026 ****
          unsigned int i;
          for (i=0; i<dead_users.used; i++) {
!             free(dead_users.list[i]);
          }
          dead_users.used = 0;
--- 1029,1033 ----
          unsigned int i;
          for (i=0; i<dead_users.used; i++) {
!             free_user(dead_users.list[i]);
          }
          dead_users.used = 0;