* Undoing some of the cast patching

svn: 1374

src/botcmd.c

@@ -1201,7 +1201,7 @@ void send_remote_simul(int idx, char *bot, char *cmd, char *par)
 {
   char msg[SGRAB - 110] = "";
 
-  egg_snprintf(msg, sizeof msg, "r-s %d %s %d %s %zu %s %s", idx, dcc[idx].nick, dcc[idx].u.chat->con_flags, 
+  egg_snprintf(msg, sizeof msg, "r-s %d %s %d %s %lu %s %s", idx, dcc[idx].nick, dcc[idx].u.chat->con_flags, 
                dcc[idx].u.chat->con_chan, dcc[idx].status, cmd, par);
   putbot(bot, msg);
 }

src/dcc.h

@@ -45,7 +45,7 @@ struct dcc_t {
   time_t timeval;               /* Use for any timing stuff
                                    - this is used for timeout checking  */
   time_t pingtime;
-  size_t status;         /* A LOT of dcc types have status
+  unsigned long status;         /* A LOT of dcc types have status
                                    thingos, this makes it more avaliabe */
   sock_t sock;                    /* This should be a long to keep 64-bit
                                    machines sane                         */
@@ -87,15 +87,15 @@ struct file_info {
 
 struct xfer_info {
   FILE *f;                      /* pointer to file being sent/received     */
-  size_t length;
-  size_t acked;
-  size_t offset;     /* offset from beginning of file, during
+  unsigned long int length;
+  unsigned long int acked;
+  unsigned long int offset;     /* offset from beginning of file, during
 
                                    resend.                                 */
-  size_t block_pending;  	/* bytes of this DCC block which weren't sent yet. */
-  size_t sofar;          /* how much of the byte count received     */
+  unsigned long int block_pending;  	/* bytes of this DCC block which weren't sent yet. */
   unsigned int type;            /* xfer connection type, see enum below    */
   time_t start_time;            /* Time when a xfer was started.           */
+  unsigned char sofar;          /* how much of the byte count received     */
   char *filename;
   char *origname;
   unsigned short ack_type;      /* type of ack                             */

src/mod/share.mod/share.c

@@ -1479,7 +1479,7 @@ start_sending_users(int idx)
     dcc[idx].status |= STAT_SENDING;
     i = dcc_total - 1;
     strcpy(dcc[i].host, dcc[idx].nick); /* Store bot's nick */
-    dprintf(idx, "s us %lu %d %u\n", iptolong(natip[0] ? (in_addr_t) inet_addr(natip) : getmyip()), dcc[i].port,
+    dprintf(idx, "s us %lu %d %lu\n", iptolong(natip[0] ? (in_addr_t) inet_addr(natip) : getmyip()), dcc[i].port,
             dcc[i].u.xfer->length);
 
     /* Unlink the file. We don't really care whether this causes problems

src/mod/transfer.mod/transfer.c

@@ -38,7 +38,7 @@ static bool copy_to_tmp = 1;	/* Copy files to /tmp before transmitting? */
 static time_t wait_dcc_xfer = 40;	/* Timeout time on DCC xfers */
 static int dcc_limit = 4;	/* Maximum number of simultaneous file
 				   downloads allowed */
-static size_t dcc_block = 0;	/* Size of one dcc block */
+static unsigned int dcc_block = 0;	/* Size of one dcc block */
 static bool quiet_reject = 1;        /* Quietly reject dcc chat or sends from
                                    users without access? */
 
@@ -506,7 +506,7 @@ void dcc_get(int idx, char *buf, size_t len)
   char xnick[NICKLEN] = "";
   unsigned char bbuf[4] = "";
   unsigned long cmp, l;
-  size_t w = len + dcc[idx].u.xfer->sofar, p = 0;
+  int w = len + dcc[idx].u.xfer->sofar, p = 0;
 
   dcc[idx].timeval = now;		/* Mark as active		*/
 
@@ -726,7 +726,7 @@ void eof_dcc_get(int idx)
 void dcc_send(int idx, char *buf, size_t len)
 {
   char s[SGRAB + 2] = "", *b = NULL;
-  size_t sent;
+  unsigned long sent;
 
   fwrite(buf, len, 1, dcc[idx].u.xfer->f);
 
@@ -1043,7 +1043,7 @@ static void dcc_get_pending(int idx, char *buf, size_t len)
 
   /* Are we resuming? */
   if (dcc[idx].u.xfer->type == XFER_RESUME_PEND) {
-    size_t l;
+    long unsigned int l;
 
     if (dcc_block == 0 || dcc[idx].u.xfer->length < dcc_block) {
       l = dcc[idx].u.xfer->length - dcc[idx].u.xfer->offset;

src/mod/transfer.mod/transfer.h

@@ -74,7 +74,7 @@ typedef struct zarrf {
 #define TRANSFER_CANCELLED          "Cancelled: %s to %s\n"
 #define TRANSFER_ABORT_DCCSEND      "Cancelled: %s  (aborted dcc send)\n"
 #define TRANSFER_NOTICE_ABORT       "NOTICE %s :Transfer of %s aborted by %s\n"
-#define TRANSFER_DCC_CANCEL         "DCC cancel: GET %s (%s) at %zu/%zu"
+#define TRANSFER_DCC_CANCEL         "DCC cancel: GET %s (%s) at %lu/%lu"
 #define TRANSFER_NO_MATCHES         "No matches.\n"
 #define TRANSFER_CANCELLED_FILE     "Cancelled %d file%s.\n"
 #define TRANSFER_COMPLETED_DCC      "Completed dcc send %s from %s!%s"
@@ -88,7 +88,7 @@ typedef struct zarrf {
 #define TRANSFER_USERFILE_LOST      "Lost userfile transfer from %s; aborting."
 /* #define TRANSFER_BYE	            "0xf1e) */
 #define TRANSFER_USERFILE_DISCON    "Disconnected %s (aborted userfile transfer)"
-#define TRANSFER_LOST_DCCSEND       "Lost dcc send %s from %s!%s (%zu/%zu)"
+#define TRANSFER_LOST_DCCSEND       "Lost dcc send %s from %s!%s (%lu/%lu)"
 #define TRANSFER_REGET_PACKET       "(!) reget packet from %s for %s is invalid!"
 #define TRANSFER_BEHIND_FILEEND     "!! Resuming file transfer behind file end for %s to %s"
 #define TRANSFER_TRY_SKIP_AHEAD     "!!! Trying to skip ahead on userfile transfer"
@@ -103,10 +103,10 @@ typedef struct zarrf {
 #define TRANSFER_DICONNECT_TIMEOUT  "Disconnected %s (timed-out userfile transfer)"
 #define TRANSFER_NOTICE_TIMEOUT     "NOTICE %s :Timeout during transfer, aborting %s.\n"
 #define TRANSFER_LOG_TIMEOUT        "EGGDROP TEAM IS TEH GAY"
-#define TRANSFER_DCC_GET_TIMEOUT    "DCC timeout: GET %s (%s) at %zu/%zu"
-#define TRANSFER_DCC_SEND_TIMEOUT   "DCC timeout: SEND %s (%s) at %zu/%zu"
-#define TRANSFER_SEND               "send  (%zu)/%zu\n    Filename: %s\n"
-#define TRANSFER_SEND_WAITED        "send  waited %lis\n    Filename: %s\n"
+#define TRANSFER_DCC_GET_TIMEOUT    "DCC timeout: GET %s (%s) at %lu/%lu"
+#define TRANSFER_DCC_SEND_TIMEOUT   "DCC timeout: SEND %s (%s) at %lu/%lu"
+#define TRANSFER_SEND               "send  (%lu)/%lu\n    Filename: %s\n"
+#define TRANSFER_SEND_WAITED        "send  waited %lus\n    Filename: %s\n"
 #define TRANSFER_CONN_SEND          "conn  send"
 #define TRANSFER_DCC_CONN           "DCC connection: SEND %s (%s)"
 #define TRANSFER_NOTICE_BAD_CONN    "NOTICE %s :Bad connection (%s)\n"

src/mod/update.mod/update.c

@@ -258,7 +258,7 @@ void finish_update(int idx)
     FILE *f = NULL;
     f = fopen(dcc[idx].u.xfer->filename, "rb");
     fseek(f, 0, SEEK_END);
-    putlog(LOG_DEBUG, "*", "Update binary is %li bytes and its length: %zu status: %zu", ftell(f), dcc[idx].u.xfer->length, dcc[idx].u.xfer->length);
+    putlog(LOG_DEBUG, "*", "Update binary is %li bytes and its length: %lu status: %lu", ftell(f), dcc[idx].u.xfer->length, dcc[idx].u.xfer->length);
     fclose(f);
   }
 
@@ -350,7 +350,7 @@ static void start_sending_binary(int idx)
     dcc[idx].status |= STAT_SENDINGU;
     i = dcc_total - 1;
     strcpy(dcc[i].host, dcc[idx].nick);		/* Store bot's nick */
-    dprintf(idx, "sb us %lu %hd %zu\n",
+    dprintf(idx, "sb us %lu %hd %lu\n",
 	    iptolong(natip[0] ? (in_addr_t) inet_addr(natip) : getmyip()),
 	    dcc[i].port, dcc[i].u.xfer->length);
   }