Changeset 0483e1e

Timestamp:

2016-11-28T19:26:16Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

90254d0

Parents:

2a1c27f

Message:

Fix some compiler warnings

warn_unused_result on write() is particularly annoying. You can't just
add (void) to ignore it due to gcc bug 66425.

I replaced some of those with fwrite() and used a variable marked with
the G_GNUC_UNUSED attribute for the writes from signal handlers.

Files:

• protocols/msn/msn_util.c (modified) (1 diff)
• protocols/msn/soap.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• unix.c (modified) (4 diffs)

protocols/msn/msn_util.c

@@ -180 +180 @@
         if (getenv("BITLBEE_DEBUG")) {
                 fprintf(stderr, "\n\x1b[92m<<< ");
-                write(2, bytes , st);
+                fwrite(bytes, st, 1, stderr);
                 fprintf(stderr, "\x1b[97m");
         }

protocols/msn/soap.c

@@ -213 +213 @@
         if (headers) {
                 if ((s = strstr(headers, "\r\n\r\n"))) {
-                        write(2, headers, s - headers + 4);
+                        fwrite(headers, s - headers + 4, 1, stderr);
                 } else {
-                        write(2, headers, strlen(headers));
+                        fwrite(headers, strlen(headers), 1, stderr);
                 }
         }

protocols/nogaim.c

@@ -54 +54 @@
         GList *l;
         struct plugin_info *i;
-        struct plugin_info *info;
+        struct plugin_info *info = NULL;
         struct plugin_info * (*info_function) (void) = NULL;
         void (*init_function) (void);

unix.c

@@ -147 +147 @@
                 struct passwd *pw = NULL;
                 pw = getpwnam(global.conf->user);
-                if (pw) {
-                        initgroups(global.conf->user, pw->pw_gid);
-                        setgid(pw->pw_gid);
-                        setuid(pw->pw_uid);
-                } else {
-                        log_message(LOGLVL_WARNING, "Failed to look up user %s.", global.conf->user);
+                if (!pw) {
+                        log_message(LOGLVL_ERROR, "Failed to look up user %s.", global.conf->user);
+
+                } else if (initgroups(global.conf->user, pw->pw_gid) != 0) {
+                        log_message(LOGLVL_ERROR, "initgroups: %s.", strerror(errno));
+
+                } else if (setgid(pw->pw_gid) != 0) {
+                        log_message(LOGLVL_ERROR, "setgid(%d): %s.", pw->pw_gid, strerror(errno));
+
+                } else if (setuid(pw->pw_uid) != 0) {
+                        log_message(LOGLVL_ERROR, "setuid(%d): %s.", pw->pw_uid, strerror(errno));
                 }
         }
@@ -281 +286 @@
 static void sighandler_shutdown(int signal)
 {
+        int unused G_GNUC_UNUSED;
         /* Write a single null byte to the pipe, just to send a message to the main loop.
          * This gets handled by bitlbee_shutdown (the b_input_add callback for this pipe) */
-        write(shutdown_pipe.fd[1], "", 1);
+        unused = write(shutdown_pipe.fd[1], "", 1);
 }
 
@@ -292 +298 @@
 {
         GSList *l;
+        int unused G_GNUC_UNUSED;
         const char *message = "ERROR :BitlBee crashed! (SIGSEGV received)\r\n";
         int len = strlen(message);
@@ -298 +305 @@
                 irc_t *irc = l->data;
                 sock_make_blocking(irc->fd);
-                write(irc->fd, message, len);
+                unused = write(irc->fd, message, len);
         }