Bug#686541: modemmanager: FTBFS with clang.

[Cyril Roelandt]

Package: modemmanager
Version: 0.5.2.0-1
Severity: normal
Tags: patch

Dear Maintainer,

modemmanager currently FTBFS with clang 3.1 (see the full log: 
http://clang.debian.net/logs/2012-06-23/modemmanager_0.5.2.0-1_unstable_clang.log).
 The attached patch fixes this issue.

WBR,
Cyril Roelandt.

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages modemmanager depends on:
ii  libc6             2.13-35
ii  libdbus-1-3       1.6.0-1
ii  libdbus-glib-1-2  0.100-1
ii  libglib2.0-0      2.32.3-1
ii  libgudev-1.0-0    175-7

Versions of packages modemmanager recommends:
ii  usb-modeswitch  1.2.3+repack0-1

modemmanager suggests no packages.

-- no debconf information

--- modemmanager-0.5.2.0.orig/libqcdm/src/result.c	2012-02-02 00:24:09.000000000 +0100
+++ modemmanager-0.5.2.0/libqcdm/src/result.c	2012-08-29 20:03:35.404875566 +0200
@@ -56,10 +56,10 @@
         if (v->u.s)
             free (v->u.s);
     } else if (v->type == VAL_TYPE_U8_ARRAY) {
-        if (v->u.u8_array);
+        if (v->u.u8_array)
             free (v->u.u8_array);
     } else if (v->type == VAL_TYPE_U16_ARRAY) {
-        if (v->u.u16_array);
+        if (v->u.u16_array)
             free (v->u.u16_array);
     }
     free (v->key);
--- modemmanager-0.5.2.0.orig/src/mm-generic-cdma.c	2012-03-13 20:06:12.000000000 +0100
+++ modemmanager-0.5.2.0/src/mm-generic-cdma.c	2012-08-29 20:05:13.164876391 +0200
@@ -592,7 +592,7 @@
     if (p) {
         errno = 0;
         num = strtoul (p, NULL, 10);
-        if (num >= 0 && num <= 4 && (errno == 0)) {
+        if (num <= 4 && (errno == 0)) {
             MM_GENERIC_CDMA_GET_PRIVATE (user_data)->orig_crm = (guint32) num;
             MM_GENERIC_CDMA_GET_PRIVATE (user_data)->cur_crm = (guint32) num;
         }
--- modemmanager-0.5.2.0.orig/src/mm-generic-gsm.c	2012-03-13 20:06:12.000000000 +0100
+++ modemmanager-0.5.2.0/src/mm-generic-gsm.c	2012-08-29 20:07:23.944877492 +0200
@@ -3210,10 +3210,8 @@
         if (act != -1)
             mm_generic_gsm_update_access_technology (self, etsi_act_to_mm_act (act));
 
-        if (status >= 0) {
-            /* Update cached registration status */
-            reg_status_updated (self, cgreg_to_reg_type (cgreg), status, NULL);
-        }
+        /* Update cached registration status */
+        reg_status_updated (self, cgreg_to_reg_type (cgreg), status, NULL);
     }
 
     return parsed;