[Havok-checkins] havokmud comm.c, 1.79, 1.80 db.c, 1.126, 1.127 mail.c, 1.21, 1.22 mail.h, 1.3, 1.4

[Anthony C. <dae...@us...>]

Update of /cvsroot/havok/havokmud
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26837

Modified Files:
	comm.c db.c mail.c mail.h 
Log Message:
changed BLOCK_SIZE to 104 for mail crashes, 
not sure why, might need to look at this more.
changed socklen_t to unsigned int because int
is giving a compiler error that the pointers
used later differ in "signedness"


Index: db.c
===================================================================
RCS file: /cvsroot/havok/havokmud/db.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** db.c	18 Mar 2008 07:51:38 -0000	1.126
--- db.c	21 Mar 2008 08:53:14 -0000	1.127
***************
*** 247,252 ****
          no_mail = 1;
      }
-     /* disable mail for crash bug */
-     no_mail = 1;
      Log("Loading zone table.");
      boot_zones();
--- 247,250 ----
***************
*** 5455,5459 ****
      if (!(strcmp(GET_NAME(ch), "Banon")) ||
          !(strcmp(GET_NAME(ch), "Gordon")) ||
! 	!(strcmp(GET_NAME(ch), "Daerious"))) {
          GET_LEVEL(ch, 0) = 60;
      }
--- 5453,5457 ----
      if (!(strcmp(GET_NAME(ch), "Banon")) ||
          !(strcmp(GET_NAME(ch), "Gordon")) ||
! 	    !(strcmp(GET_NAME(ch), "Daerious"))) {
          GET_LEVEL(ch, 0) = 60;
      }

Index: mail.h
===================================================================
RCS file: /cvsroot/havok/havokmud/mail.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mail.h	17 Jun 2004 17:01:59 -0000	1.3
--- mail.h	21 Mar 2008 08:53:14 -0000	1.4
***************
*** 57,61 ****
   * size of mail file allocation blocks 
   */
! #define BLOCK_SIZE 100
  
  /*
--- 57,61 ----
   * size of mail file allocation blocks 
   */
! #define BLOCK_SIZE 104
  
  /*

Index: mail.c
===================================================================
RCS file: /cvsroot/havok/havokmud/mail.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mail.c	29 Feb 2008 20:52:57 -0000	1.21
--- mail.c	21 Mar 2008 08:53:14 -0000	1.22
***************
*** 163,167 ****
  
      mail_file = fopen(MAIL_FILE, "r+b");
! 
      if (filepos % BLOCK_SIZE) {
          Log("SYSERR: Mail system -- fatal error #2!!!");
--- 163,167 ----
  
      mail_file = fopen(MAIL_FILE, "r+b");
!     
      if (filepos % BLOCK_SIZE) {
          Log("SYSERR: Mail system -- fatal error #2!!!");
***************
*** 290,295 ****
  int has_mail(char *recipient)
  {
-     /* temp disable to try to fix crashes */
-     return 0;
  
      if (find_char_in_index(recipient))
--- 290,293 ----

Index: comm.c
===================================================================
RCS file: /cvsroot/havok/havokmud/comm.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** comm.c	21 Mar 2008 01:18:39 -0000	1.79
--- comm.c	21 Mar 2008 08:53:14 -0000	1.80
***************
*** 33,37 ****
  #ifndef __CYGWIN__
  #ifndef HAVE_SOCKLEN_T
! #define socklen_t int
  #endif
  #endif
--- 33,37 ----
  #ifndef __CYGWIN__
  #ifndef HAVE_SOCKLEN_T
! #define socklen_t unsigned int
  #endif
  #endif