Changeset 52744f8

Timestamp:

2008-01-17T22:06:55Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ac4adf9

Parents:

13857c6

Message:

Fixing some Solaris compiler warnings (u_int->uint, adding some typecasts
for pid_t variables).

Files:

• bitlbee.c (modified) (1 diff)
• ipc.c (modified) (3 diffs)
• lib/md5.c (modified) (7 diffs)
• lib/md5.h (modified) (1 diff)
• protocols/nogaim.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (3 diffs)
• unix.c (modified) (1 diff)

bitlbee.c

@@ -279 +279 @@
                         child_list = g_slist_append( child_list, child );
                         
-                        log_message( LOGLVL_INFO, "Creating new subprocess with pid %d.", client_pid );
+                        log_message( LOGLVL_INFO, "Creating new subprocess with pid %d.", (int) client_pid );
                         
                         /* Close some things we don't need in the parent process. */

ipc.c

@@ -52 +52 @@
         if( g_strcasecmp( cmd[0], "CLIENT" ) == 0 )
                 ipc_to_children_str( "OPERMSG :Client connecting (PID=%d): %s@%s (%s)\r\n",
-                                     child ? child->pid : -1, cmd[2], cmd[1], cmd[3] );
+                                     (int) ( child ? child->pid : -1 ), cmd[2], cmd[1], cmd[3] );
 }
 
@@ -446 +446 @@
         
         for( l = child_list; l; l = l->next )
-                fprintf( fp, "%d %d\n", ((struct bitlbee_child*)l->data)->pid,
+                fprintf( fp, "%d %d\n", (int) ((struct bitlbee_child*)l->data)->pid,
                                         ((struct bitlbee_child*)l->data)->ipc_fd );
         
@@ -551 +551 @@
                 child = g_new0( struct bitlbee_child, 1 );
                 
-                if( fscanf( fp, "%d %d", &child->pid, &child->ipc_fd ) != 2 )
+                if( fscanf( fp, "%d %d", (int *) &child->pid, &child->ipc_fd ) != 2 )
                 {
                         log_message( LOGLVL_WARNING, "Unexpected end of file: Only processed %d clients.", i );

lib/md5.c

@@ -26 +26 @@
 #include "md5.h"
 
-static void md5_transform(u_int32_t buf[4], u_int32_t const in[16]);
+static void md5_transform(uint32_t buf[4], uint32_t const in[16]);
 
 /*
@@ -53 +53 @@
                 unsigned int len)
 {
-        u_int32_t t;
+        uint32_t t;
 
         /* Update bitcount */
 
         t = ctx->bits[0];
-        if ((ctx->bits[0] = t + ((u_int32_t) len << 3)) < t)
+        if ((ctx->bits[0] = t + ((uint32_t) len << 3)) < t)
                 ctx->bits[1]++; /* Carry from low to high */
         ctx->bits[1] += len >> 29;
@@ -75 +75 @@
                 }
                 memcpy(p, buf, t);
-                md5_transform(ctx->buf, (u_int32_t *) ctx->in);
+                md5_transform(ctx->buf, (uint32_t *) ctx->in);
                 buf += t;
                 len -= t;
@@ -83 +83 @@
         while (len >= 64) {
                 memcpy(ctx->in, buf, 64);
-                md5_transform(ctx->buf, (u_int32_t *) ctx->in);
+                md5_transform(ctx->buf, (uint32_t *) ctx->in);
                 buf += 64;
                 len -= 64;
@@ -117 +117 @@
                 /* Two lots of padding:  Pad the first block to 64 bytes */
                 memset(p, 0, count);
-                md5_transform(ctx->buf, (u_int32_t *) ctx->in);
+                md5_transform(ctx->buf, (uint32_t *) ctx->in);
 
                 /* Now fill the next block with 56 bytes */
@@ -127 +127 @@
 
         /* Append length in bits and transform */
-        ((u_int32_t *) ctx->in)[14] = ctx->bits[0];
-        ((u_int32_t *) ctx->in)[15] = ctx->bits[1];
-
-        md5_transform(ctx->buf, (u_int32_t *) ctx->in);
+        ((uint32_t *) ctx->in)[14] = ctx->bits[0];
+        ((uint32_t *) ctx->in)[15] = ctx->bits[1];
+
+        md5_transform(ctx->buf, (uint32_t *) ctx->in);
         memcpy(digest, ctx->buf, 16);
         memset(ctx, 0, sizeof(ctx));    /* In case it's sensitive */
@@ -152 +152 @@
  * the data and converts bytes into longwords for this routine.
  */
-static void md5_transform(u_int32_t buf[4], u_int32_t const in[16])
-{
-        register u_int32_t a, b, c, d;
+static void md5_transform(uint32_t buf[4], uint32_t const in[16])
+{
+        register uint32_t a, b, c, d;
 
         a = buf[0];

lib/md5.h

@@ -27 +27 @@
 #include <sys/types.h>
 #include <gmodule.h>
+#include <stdint.h>
 
-typedef u_int8_t md5_byte_t;
+typedef uint8_t md5_byte_t;
 typedef struct MD5Context {
-        u_int32_t buf[4];
-        u_int32_t bits[2];
+        uint32_t buf[4];
+        uint32_t bits[2];
         unsigned char in[64];
 } md5_state_t;

protocols/nogaim.c

@@ -625 +625 @@
 }
 
-void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, u_int32_t flags, time_t sent_at )
+void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t flags, time_t sent_at )
 {
         irc_t *irc = ic->irc;
@@ -676 +676 @@
 }
 
-void imcb_buddy_typing( struct im_connection *ic, char *handle, u_int32_t flags )
+void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags )
 {
         user_t *u;
@@ -732 +732 @@
 }
 
-void imcb_chat_msg( struct groupchat *c, char *who, char *msg, u_int32_t flags, time_t sent_at )
+void imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at )
 {
         struct im_connection *ic = c->ic;

protocols/nogaim.h

@@ -68 +68 @@
 {
         account_t *acc;
-        u_int32_t flags;
+        uint32_t flags;
         
         /* each connection then can have its own protocol-specific data */
@@ -282 +282 @@
 /* Not implemented yet! */ G_MODULE_EXPORT void imcb_buddy_times( struct im_connection *ic, const char *handle, time_t login, time_t idle );
 /* Call when a handle says something. 'flags' and 'sent_at may be just 0. */
-G_MODULE_EXPORT void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, u_int32_t flags, time_t sent_at );
-G_MODULE_EXPORT void imcb_buddy_typing( struct im_connection *ic, char *handle, u_int32_t flags );
+G_MODULE_EXPORT void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t flags, time_t sent_at );
+G_MODULE_EXPORT void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags );
 G_MODULE_EXPORT void imcb_clean_handle( struct im_connection *ic, char *handle );
 
@@ -299 +299 @@
 G_MODULE_EXPORT void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason );
 /* To tell BitlBee 'who' said 'msg' in 'c'. 'flags' and 'sent_at' can be 0. */
-G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, char *who, char *msg, u_int32_t flags, time_t sent_at );
+G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at );
 /* To tell BitlBee 'who' changed the topic of 'c' to 'topic'. */
 G_MODULE_EXPORT void imcb_chat_topic( struct groupchat *c, char *who, char *topic, time_t set_at );

unix.c

@@ -197 +197 @@
                 {
                         if( WIFSIGNALED( st ) )
-                                log_message( LOGLVL_INFO, "Client %d terminated normally. (status = %d)", pid, WEXITSTATUS( st ) );
+                                log_message( LOGLVL_INFO, "Client %d terminated normally. (status = %d)", (int) pid, WEXITSTATUS( st ) );
                         else if( WIFEXITED( st ) )
-                                log_message( LOGLVL_INFO, "Client %d killed by signal %d.", pid, WTERMSIG( st ) );
+                                log_message( LOGLVL_INFO, "Client %d killed by signal %d.", (int) pid, WTERMSIG( st ) );
                 }
         }