Fix more dev-mode build issues
authorKinsey Moore <kmoore@digium.com>
Tue, 22 Jul 2014 14:22:00 +0000 (14:22 +0000)
committerKinsey Moore <kmoore@digium.com>
Tue, 22 Jul 2014 14:22:00 +0000 (14:22 +0000)
........

Merged revisions 419129 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 419162 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 419163 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419175 65c4cc65-6c06-0410-ace0-fbb531ad65f3

19 files changed:
addons/chan_ooh323.c
addons/ooh323c/src/ooq931.c
addons/ooh323c/src/printHandler.c
apps/app_meetme.c
res/res_corosync.c
res/res_mwi_external_ami.c
tests/test_abstract_jb.c
tests/test_aoc.c
tests/test_astobj2.c
tests/test_astobj2_thrash.c
tests/test_config.c
tests/test_event.c
tests/test_hashtab_thrash.c
tests/test_json.c
tests/test_logger.c
tests/test_optional_api.c
tests/test_sorcery.c
tests/test_sorcery_realtime.c
tests/test_voicemail_api.c

index f02002f..1d37fbc 100644 (file)
@@ -1118,7 +1118,7 @@ static int ooh323_answer(struct ast_channel *ast)
                        ast_channel_lock(ast);
                        if (!p->alertsent) {
                                if (gH323Debug) {
-                                       ast_debug(1, "Sending forced ringback for %s, res = %d\n", 
+                                       ast_debug(1, "Sending forced ringback for %s, res = %u\n", 
                                                callToken, ooManualRingback(callToken));
                                } else {
                                        ooManualRingback(callToken);
@@ -1172,7 +1172,7 @@ static int ooh323_write(struct ast_channel *ast, struct ast_frame *f)
                p->lastrtptx = time(NULL);
 
                if (f->frametype == AST_FRAME_MODEM) {
-                       ast_debug(1, "Send UDPTL %d/%d len %d for %s\n",
+                       ast_debug(1, "Send UDPTL %u/%d len %d for %s\n",
                                f->frametype, f->subclass.integer, f->datalen, ast_channel_name(ast));
                        if (p->udptl)
                                res = ast_udptl_write(p->udptl, f);
@@ -1218,7 +1218,7 @@ static int ooh323_write(struct ast_channel *ast, struct ast_frame *f)
                        ast_mutex_unlock(&p->lock);
                        return 0;
                } else {
-                       ast_log(LOG_WARNING, "Can't send %d type frames with OOH323 write\n", 
+                       ast_log(LOG_WARNING, "Can't send %u type frames with OOH323 write\n", 
                                                                         f->frametype);
                        ast_mutex_unlock(&p->lock);
                        return 0;
@@ -1282,7 +1282,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
                if (ast_channel_state(ast) != AST_STATE_UP) {
                        if (!p->progsent) {
                                if (gH323Debug) {
-                                       ast_debug(1, "Sending manual progress for %s, res = %d\n", callToken,
+                                       ast_debug(1, "Sending manual progress for %s, res = %u\n", callToken,
                                        ooManualProgress(callToken));   
                                } else {
                                        ooManualProgress(callToken);
@@ -1295,7 +1295,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d
                if (ast_channel_state(ast) == AST_STATE_RING || ast_channel_state(ast) == AST_STATE_RINGING) {
                        if (!p->alertsent) {
                                if (gH323Debug) {
-                                       ast_debug(1, "Sending manual ringback for %s, res = %d\n",
+                                       ast_debug(1, "Sending manual ringback for %s, res = %u\n",
                                                callToken,
                                                ooManualRingback(callToken));
                                } else {
@@ -3208,7 +3208,7 @@ static char *handle_cli_ooh323_show_peer(struct ast_cli_entry *e, int cmd, struc
                ast_cli(a->fd, "%-15.15s%s\n", "AccountCode: ", peer->accountcode);
                ast_cli(a->fd, "%-15.15s%s\n", "AMA flags: ", ast_channel_amaflags2string(peer->amaflags));
                ast_cli(a->fd, "%-15.15s%s\n", "IP:Port: ", ip_port);
-               ast_cli(a->fd, "%-15.15s%d\n", "OutgoingLimit: ", peer->outgoinglimit);
+               ast_cli(a->fd, "%-15.15s%u\n", "OutgoingLimit: ", peer->outgoinglimit);
                ast_cli(a->fd, "%-15.15s%d\n", "rtptimeout: ", peer->rtptimeout);
                ast_cli(a->fd, "%-15.15s%s\n", "nat: ", peer->nat?"yes":"no");
                if (peer->rtpmaskstr[0]) {
@@ -3347,7 +3347,7 @@ static char *handle_cli_ooh323_show_user(struct ast_cli_entry *e, int cmd, struc
                ast_cli(a->fd, "%-15.15s%s\n", "AMA flags: ", ast_channel_amaflags2string(user->amaflags));
                ast_cli(a->fd, "%-15.15s%s\n", "Context: ", user->context);
                ast_cli(a->fd, "%-15.15s%d\n", "IncomingLimit: ", user->incominglimit);
-               ast_cli(a->fd, "%-15.15s%d\n", "InUse: ", user->inUse);
+               ast_cli(a->fd, "%-15.15s%u\n", "InUse: ", user->inUse);
                ast_cli(a->fd, "%-15.15s%d\n", "rtptimeout: ", user->rtptimeout);
                ast_cli(a->fd, "%-15.15s%s\n", "nat: ", user->nat?"yes":"no");
                if (user->rtpmaskstr[0]) {
@@ -4416,7 +4416,7 @@ static enum ast_rtp_glue_result ooh323_get_rtp_peer(struct ast_channel *chan, st
 
        ast_rtp_instance_get_remote_address(*rtp, &tmp);
        if (gH323Debug) {
-               ast_verb(0, "ooh323_get_rtp_peer  %s -> %s:%d, %d\n", ast_channel_name(chan), ast_sockaddr_stringify_addr(&tmp),
+               ast_verb(0, "ooh323_get_rtp_peer  %s -> %s:%d, %u\n", ast_channel_name(chan), ast_sockaddr_stringify_addr(&tmp),
                                                ast_sockaddr_port(&tmp), res);
        }
        if (gH323Debug) {
@@ -4943,7 +4943,7 @@ struct ast_frame *ooh323_rtp_read(struct ast_channel *ast, struct ooh323_pvt *p)
        case 5:
                f = ast_udptl_read(p->udptl);           /* UDPTL t.38 data */
                if (gH323Debug) {
-                        ast_debug(1, "Got UDPTL %d/%d len %d for %s\n",
+                        ast_debug(1, "Got UDPTL %u/%d len %d for %s\n",
                                f->frametype, f->subclass.integer, f->datalen, ast_channel_name(ast));
                }
                p->lastrtprx = time(NULL);
index a6bdea4..86ecd92 100644 (file)
@@ -319,7 +319,7 @@ char* ooQ931GetMessageTypeName(int messageType, char* buf) {
          strcpy(buf, "Escape");
          break;
       default:
-         sprintf(buf, "<%u>", messageType);
+         sprintf(buf, "<%d>", messageType);
    }
    return buf;
 }
@@ -360,7 +360,7 @@ char* ooQ931GetIEName(int number, char* buf) {
          strcpy(buf, "User-User");
          break;
       default:
-         sprintf(buf, "0x%02x", number);
+         sprintf(buf, "0x%02x", (unsigned)number);
    }
    return buf;
 }
@@ -371,8 +371,8 @@ EXTERN void ooQ931Print (const Q931Message* q931msg) {
    unsigned int i;
 
    printf("Q.931 Message:\n");
-   printf("   protocolDiscriminator: %i\n", q931msg->protocolDiscriminator);
-   printf("   callReference: %i\n", q931msg->callReference);
+   printf("   protocolDiscriminator: %u\n", q931msg->protocolDiscriminator);
+   printf("   callReference: %u\n", q931msg->callReference);
    printf("   from: %s\n", (q931msg->fromDestination ? 
                                        "destination" : "originator"));
    printf("   messageType: %s (0x%X)\n\n", 
@@ -382,9 +382,9 @@ EXTERN void ooQ931Print (const Q931Message* q931msg) {
    for(i = 0, curNode = q931msg->ies.head; i < q931msg->ies.count; i++) {
       Q931InformationElement *ie = (Q931InformationElement*) curNode->data;
       int length = (ie->length >= 0) ? ie->length : -ie->length;
-      printf("   IE[%i] (offset 0x%X):\n", i, ie->offset);
+      printf("   IE[%u] (offset 0x%X):\n", i, (unsigned)ie->offset);
       printf("      discriminator: %s (0x%X)\n", 
-               ooQ931GetIEName(ie->discriminator, buf), ie->discriminator);
+               ooQ931GetIEName(ie->discriminator, buf), (unsigned)ie->discriminator);
       printf("      data length: %i\n", length);
  
       curNode = curNode->next;
index 3931169..3986a86 100644 (file)
@@ -268,7 +268,7 @@ static const char* octStrToString
       if (bufsiz > 1) buffer[1] = '\0';
       for (i = 0; i < numocts; i++) {
          if (i < bufsiz - 1) {
-            sprintf (lbuf, "%02x", data[i]);
+            sprintf (lbuf, "%02x", (unsigned)data[i]);
             strcat (&buffer[(i*2)+1], lbuf);
          }
          else break;
index 6d0b5ac..0f1c1a8 100644 (file)
@@ -3238,7 +3238,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
 
        if (ast_test_flag64(confflags, CONFFLAG_DURATION_STOP) && !ast_strlen_zero(optargs[OPT_ARG_DURATION_STOP])) {
                calldurationlimit = atoi(optargs[OPT_ARG_DURATION_STOP]);
-               ast_verb(3, "Setting call duration limit to %d seconds.\n", calldurationlimit);
+               ast_verb(3, "Setting call duration limit to %u seconds.\n", calldurationlimit);
        }
 
        if (ast_test_flag64(confflags, CONFFLAG_DURATION_LIMIT) && !ast_strlen_zero(optargs[OPT_ARG_DURATION_LIMIT])) {
@@ -4274,12 +4274,12 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
                                                break;
                                        default:
                                                ast_debug(1,
-                                                       "Got ignored control frame on channel %s, f->frametype=%d,f->subclass=%d\n",
+                                                       "Got ignored control frame on channel %s, f->frametype=%u,f->subclass=%d\n",
                                                        ast_channel_name(chan), f->frametype, f->subclass.integer);
                                        }
                                } else {
                                        ast_debug(1,
-                                               "Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",
+                                               "Got unrecognized frame on channel %s, f->frametype=%u,f->subclass=%d\n",
                                                ast_channel_name(chan), f->frametype, f->subclass.integer);
                                }
                                ast_frfree(f);
@@ -7099,7 +7099,7 @@ static int sla_station_exec(struct ast_channel *chan, const char *data)
                ast_cond_destroy(&cond);
                ast_autoservice_stop(chan);
                if (!trunk_ref->trunk->chan) {
-                       ast_debug(1, "Trunk didn't get created. chan: %lx\n", (long) trunk_ref->trunk->chan);
+                       ast_debug(1, "Trunk didn't get created. chan: %lx\n", (unsigned long) trunk_ref->trunk->chan);
                        pbx_builtin_setvar_helper(chan, "SLASTATION_STATUS", "CONGESTION");
                        sla_change_trunk_state(trunk_ref->trunk, SLA_TRUNK_STATE_IDLE, ALL_TRUNK_REFS, NULL);
                        trunk_ref->chan = NULL;
index 6c4a3d1..f733413 100644 (file)
@@ -333,7 +333,7 @@ static void cpg_deliver_cb(cpg_handle_t handle, const struct cpg_name *group_nam
                ast_eid_to_str(buf, sizeof(buf), (struct ast_eid *) eid);
                ast_log(LOG_NOTICE, "Got event PING from server with EID: '%s'\n", buf);
        }
-       ast_debug(5, "Publishing event %s (%d) to stasis\n",
+       ast_debug(5, "Publishing event %s (%u) to stasis\n",
                ast_event_get_type_name(event), event_type);
        publish_handler(event);
 }
@@ -367,13 +367,13 @@ static void publish_to_corosync(struct stasis_message *message)
        iov.iov_base = (void *)event;
        iov.iov_len = ast_event_get_size(event);
 
-       ast_debug(5, "Publishing event %s (%d) to corosync\n",
+       ast_debug(5, "Publishing event %s (%u) to corosync\n",
                ast_event_get_type_name(event), ast_event_get_type(event));
 
        /* The stasis subscription will only exist if we are configured to publish
         * these events, so just send away. */
        if ((cs_err = cpg_mcast_joined(cpg_handle, CPG_TYPE_FIFO, &iov, 1)) != CS_OK) {
-               ast_log(LOG_WARNING, "CPG mcast failed (%d)\n", cs_err);
+               ast_log(LOG_WARNING, "CPG mcast failed (%u)\n", cs_err);
        }
 }
 
@@ -476,13 +476,13 @@ static void *dispatch_thread_handler(void *data)
 
                if (pfd[0].revents & POLLIN) {
                        if ((cs_err = cpg_dispatch(cpg_handle, CS_DISPATCH_ALL)) != CS_OK) {
-                               ast_log(LOG_WARNING, "Failed CPG dispatch: %d\n", cs_err);
+                               ast_log(LOG_WARNING, "Failed CPG dispatch: %u\n", cs_err);
                        }
                }
 
                if (pfd[1].revents & POLLIN) {
                        if ((cs_err = corosync_cfg_dispatch(cfg_handle, CS_DISPATCH_ALL)) != CS_OK) {
-                               ast_log(LOG_WARNING, "Failed CFG dispatch: %d\n", cs_err);
+                               ast_log(LOG_WARNING, "Failed CFG dispatch: %u\n", cs_err);
                        }
                }
 
@@ -582,7 +582,7 @@ static char *corosync_show_members(struct ast_cli_entry *e, int cmd, struct ast_
                        continue;
                }
 
-               ast_cli(a->fd, "=== Node %d\n", i);
+               ast_cli(a->fd, "=== Node %u\n", i);
                ast_cli(a->fd, "=== --> Group: %s\n", cpg_desc.group.value);
 
                for (j = 0; j < num_addrs; j++) {
@@ -592,7 +592,7 @@ static char *corosync_show_members(struct ast_cli_entry *e, int cmd, struct ast_
 
                        getnameinfo(sa, sa_len, buf, sizeof(buf), NULL, 0, NI_NUMERICHOST);
 
-                       ast_cli(a->fd, "=== --> Address %d: %s\n", j + 1, buf);
+                       ast_cli(a->fd, "=== --> Address %u: %s\n", j + 1, buf);
                }
 
        }
index 1abb7b5..1a4ee34 100644 (file)
@@ -229,7 +229,7 @@ static int mwi_mailbox_get(struct mansession *s, const struct message *m)
        astman_append(s,
                "Event: MWIGetComplete\r\n"
                "EventList: Complete\r\n"
-               "ListItems: %d\r\n"
+               "ListItems: %u\r\n"
                "%s"
                "\r\n", count, id_text);
 
index f0c0315..7f16cec 100644 (file)
@@ -115,6 +115,15 @@ static struct ast_frame *create_test_frame(long timestamp,
        } } while (0)
 
 /*! \internal
+ * \brief Test two numeric (unsigned int) values.
+*/
+#define UINT_TEST(actual, expected) do { \
+       if ((actual) != (expected)) { \
+               ast_test_status_update(test, #actual ": expected [%u]; actual [%u]\n", (expected), (actual)); \
+               return AST_TEST_FAIL; \
+       } } while (0)
+
+/*! \internal
  * \brief Test two string values
 */
 #define STRING_TEST(actual, expected) do { \
@@ -127,7 +136,7 @@ static struct ast_frame *create_test_frame(long timestamp,
  * \brief Verify that two frames have the same properties
  */
 #define VERIFY_FRAME(actual, expected) do { \
-       INT_TEST((actual)->frametype, (expected)->frametype); \
+       UINT_TEST((actual)->frametype, (expected)->frametype); \
        INT_TEST((actual)->seqno, (expected)->seqno); \
        LONG_INT_TEST((actual)->ts, (expected)->ts); \
        LONG_INT_TEST((actual)->len, (expected)->len); \
index 7ac1d30..35387df 100644 (file)
@@ -411,7 +411,7 @@ AST_TEST_DEFINE(aoc_encode_decode_test)
                        if (!(unit = ast_aoc_get_unit_info(decoded, i)) ||
                                ((unit->valid_amount) && (unit->amount != (i+1))) ||
                                ((unit->valid_type) && (unit->type != (i+2)))) {
-                               ast_test_status_update(test, "TEST 2, invalid unit entry result, got %d,%d, expected %d,%d\n",
+                               ast_test_status_update(test, "TEST 2, invalid unit entry result, got %u,%u, expected %d,%d\n",
                                        unit->amount,
                                        unit->type,
                                        i+1,
index 13ce7f9..867c906 100644 (file)
@@ -489,7 +489,7 @@ static int astobj2_test_1_helper(int tst_num, enum test_container_type type, int
                }
        }
 
-       ast_test_status_update(test, "%s container created: buckets: %d, items: %d\n",
+       ast_test_status_update(test, "%s container created: buckets: %d, items: %u\n",
                c_type, n_buckets, lim);
 
        /* Testing ao2_container_clone */
index f43445a..814234c 100644 (file)
@@ -82,7 +82,7 @@ static char *ht_new(int i)
        if (keybuf == NULL) {
                return NULL;
        }
-       needed = snprintf(keybuf, buflen, "key%08x", i);
+       needed = snprintf(keybuf, buflen, "key%08x", (unsigned)i);
        ast_atomic_fetchadd_int(&alloc_count, 1);
        ast_assert(needed + 1 <= buflen);
        return keybuf;
index a8a83b2..a9a281d 100644 (file)
@@ -883,19 +883,19 @@ AST_TEST_DEFINE(config_options_test)
        arr[3] = item_defaults;
        /* Test global and item against configs, global_defaults and item_defaults against defaults */
 
-#define NOT_EQUAL_FAIL(field)  \
+#define NOT_EQUAL_FAIL(field, format)  \
        if (arr[x]->field != control->field) { \
-               ast_test_status_update(test, "%s did not match: %d != %d with x = %d\n", #field, arr[x]->field, control->field, x); \
+               ast_test_status_update(test, "%s did not match: " format " != " format " with x = %d\n", #field, arr[x]->field, control->field, x); \
                res = AST_TEST_FAIL; \
        }
        for (x = 0; x < 4; x++) {
                struct test_item *control = x < 2 ? &configs : &defaults;
 
-               NOT_EQUAL_FAIL(intopt);
-               NOT_EQUAL_FAIL(uintopt);
-               NOT_EQUAL_FAIL(boolopt);
-               NOT_EQUAL_FAIL(flags);
-               NOT_EQUAL_FAIL(customopt);
+               NOT_EQUAL_FAIL(intopt, "%d");
+               NOT_EQUAL_FAIL(uintopt, "%u");
+               NOT_EQUAL_FAIL(boolopt, "%d");
+               NOT_EQUAL_FAIL(flags, "%u");
+               NOT_EQUAL_FAIL(customopt, "%d");
                if (fabs(arr[x]->doubleopt - control->doubleopt) > 0.001) {
                        ast_test_status_update(test, "doubleopt did not match: %f vs %f on loop %d\n", arr[x]->doubleopt, control->doubleopt, x);
                        res = AST_TEST_FAIL;
index a7279e5..ab6eab1 100644 (file)
@@ -58,7 +58,7 @@ static int check_event(struct ast_event *event, struct ast_test *test,
        /* Check #1: Ensure event type is set properly. */
        type = ast_event_get_type(event);
        if (ast_event_get_type(event) != type) {
-               ast_test_status_update(test, "Expected event type: '%d', got '%d'\n",
+               ast_test_status_update(test, "Expected event type: '%u', got '%u'\n",
                                expected_type, type);
                return -1;
        }
index 14ec52b..7379b95 100644 (file)
@@ -83,7 +83,7 @@ static char *ht_new(int i)
        if (keybuf == NULL) {
                return NULL;
        }
-       needed = snprintf(keybuf, buflen, "key%08x", i);
+       needed = snprintf(keybuf, buflen, "key%08x", (unsigned)i);
        ast_assert(needed + 1 <= buflen);
        return keybuf;
 }
index 8ef490b..9d624cd 100644 (file)
@@ -85,7 +85,7 @@ static int json_test_cleanup(struct ast_test_info *info, struct ast_test *test)
        ast_json_reset_alloc_funcs();
        if (0 != alloc_count) {
                ast_test_status_update(test,
-                       "JSON test leaked %zd allocations!\n", alloc_count);
+                       "JSON test leaked %zu allocations!\n", alloc_count);
                return -1;
        }
        return 0;
index 2cc811d..b0df4c6 100644 (file)
@@ -55,12 +55,12 @@ static void output_tests(struct test *tests, size_t num_tests, int fd)
        unsigned int x;
 
        for (x = 0; x < num_tests; x++) {
-               ast_cli(fd, "Test %d: %s\n", x + 1, tests[x].name);
-               ast_cli(fd, "\tExpected Successes: %d\n", tests[x].x_success);
-               ast_cli(fd, "\tExpected Failures: %d\n", tests[x].x_failure);
-               ast_cli(fd, "\tUnexpected Successes: %d\n", tests[x].u_success);
-               ast_cli(fd, "\tUnexpected Failures: %d\n", tests[x].u_failure);
-               ast_cli(fd, "Test %d Result: %s\n", x + 1, (tests[x].u_success + tests[x].u_failure) ? "FAIL" : "PASS");
+               ast_cli(fd, "Test %u: %s\n", x + 1, tests[x].name);
+               ast_cli(fd, "\tExpected Successes: %u\n", tests[x].x_success);
+               ast_cli(fd, "\tExpected Failures: %u\n", tests[x].x_failure);
+               ast_cli(fd, "\tUnexpected Successes: %u\n", tests[x].u_success);
+               ast_cli(fd, "\tUnexpected Failures: %u\n", tests[x].u_failure);
+               ast_cli(fd, "Test %u Result: %s\n", x + 1, (tests[x].u_success + tests[x].u_failure) ? "FAIL" : "PASS");
        }
 }
 
@@ -88,11 +88,11 @@ static char *handle_cli_dynamic_level_test(struct ast_cli_entry *e, int cmd, str
        }
 
        for (test = 0; test < ARRAY_LEN(tests); test++) {
-               ast_cli(a->fd, "Test %d: %s.\n", test + 1, tests[test].name);
+               ast_cli(a->fd, "Test %u: %s.\n", test + 1, tests[test].name);
                switch (test) {
                case 0:
                        if ((level = ast_logger_register_level("test")) != -1) {
-                               ast_cli(a->fd, "Test: got level %d\n", level);
+                               ast_cli(a->fd, "Test: got level %u\n", level);
                                ast_log_dynamic_level(level, "Logger Dynamic Test: Test 1\n");
                                ast_logger_unregister_level("test");
                                tests[test].x_success++;
@@ -106,7 +106,7 @@ static char *handle_cli_dynamic_level_test(struct ast_cli_entry *e, int cmd, str
                        char level_name[18][8];
 
                        for (x = 0; x < ARRAY_LEN(level_name); x++) {
-                               sprintf(level_name[x], "level%02d", x);
+                               sprintf(level_name[x], "level%02u", x);
                                if ((level = ast_logger_register_level(level_name[x])) == -1) {
                                        if (x < 16) {
                                                tests[test].u_failure++;
@@ -115,7 +115,7 @@ static char *handle_cli_dynamic_level_test(struct ast_cli_entry *e, int cmd, str
                                        }
                                        level_name[x][0] = '\0';
                                } else {
-                                       ast_cli(a->fd, "Test: registered '%s', got level %d\n", level_name[x], level);
+                                       ast_cli(a->fd, "Test: registered '%s', got level %u\n", level_name[x], level);
                                        if (x < 16) {
                                                tests[test].x_success++;
                                        } else {
@@ -159,7 +159,7 @@ static char *handle_cli_performance_test(struct ast_cli_entry *e, int cmd, struc
        }
 
        for (test = 0; test < ARRAY_LEN(tests); test++) {
-               ast_cli(a->fd, "Test %d: %s.\n", test + 1, tests[test].name);
+               ast_cli(a->fd, "Test %u: %s.\n", test + 1, tests[test].name);
                switch (test) {
                case 0:
                        if ((level = ast_logger_register_level("perftest")) != -1) {
@@ -167,7 +167,7 @@ static char *handle_cli_performance_test(struct ast_cli_entry *e, int cmd, struc
                                struct timeval start, end;
                                int elapsed;
 
-                               ast_cli(a->fd, "Test: got level %d\n", level);
+                               ast_cli(a->fd, "Test: got level %u\n", level);
                                start = ast_tvnow();
                                for (x = 0; x < 10000; x++) {
                                        ast_log_dynamic_level(level, "Performance test log message\n");
index 841dd5f..6a7d394 100644 (file)
@@ -99,7 +99,7 @@ AST_TEST_DEFINE(test_provide_first)
        test_optional();
 
        if (was_called_result != IMPL) {
-               ast_test_status_update(test, "Expected %d, was %d",
+               ast_test_status_update(test, "Expected %d, was %u",
                        IMPL, was_called_result);
                goto done;
        }
@@ -135,7 +135,7 @@ AST_TEST_DEFINE(test_provide_last)
 
        test_optional();
        if (was_called_result != STUB) {
-               ast_test_status_update(test, "Expected %d, was %d",
+               ast_test_status_update(test, "Expected %d, was %u",
                        STUB, was_called_result);
                goto done;
        }
@@ -144,7 +144,7 @@ AST_TEST_DEFINE(test_provide_last)
 
        test_optional();
        if (was_called_result != IMPL) {
-               ast_test_status_update(test, "Expected %d, was %d",
+               ast_test_status_update(test, "Expected %d, was %u",
                        IMPL, was_called_result);
                ast_optional_api_unprovide(SYMNAME, test_optional_impl);
                goto done;
@@ -154,7 +154,7 @@ AST_TEST_DEFINE(test_provide_last)
 
        test_optional();
        if (was_called_result != STUB) {
-               ast_test_status_update(test, "Expected %d, was %d",
+               ast_test_status_update(test, "Expected %d, was %u",
                        STUB, was_called_result);
                ast_optional_api_unprovide(SYMNAME, test_optional_impl);
                goto done;
index aa34a11..2d811b1 100644 (file)
@@ -2906,7 +2906,7 @@ AST_TEST_DEFINE(dialplan_function)
        }
        if (strcmp(ast_str_buffer(buf), "5")) {
                ast_free(buf);
-               ast_test_status_update(test, "Failed retrieve field.  Got '%d', should be '5'\n", obj->bob);
+               ast_test_status_update(test, "Failed retrieve field.  Got '%u', should be '5'\n", obj->bob);
                return AST_TEST_FAIL;
        }
 
@@ -2919,7 +2919,7 @@ AST_TEST_DEFINE(dialplan_function)
        }
        if (strcmp(ast_str_buffer(buf), "5")) {
                ast_free(buf);
-               ast_test_status_update(test, "Failed retrieve field.  Got '%d', should be '5'\n", obj->bob);
+               ast_test_status_update(test, "Failed retrieve field.  Got '%u', should be '5'\n", obj->bob);
                return AST_TEST_FAIL;
        }
 
index e3d0a4b..b64ad93 100644 (file)
@@ -790,11 +790,11 @@ AST_TEST_DEFINE(object_allocate_on_retrieval)
        }
 
        if (obj->bob != 42) {
-               ast_test_status_update(test, "Object's 'bob' field does not have expected value: %d != 42\n",
+               ast_test_status_update(test, "Object's 'bob' field does not have expected value: %u != 42\n",
                                obj->bob);
                return AST_TEST_FAIL;
        } else if (obj->joe != 93) {
-               ast_test_status_update(test, "Object's 'joe' field does not have expected value: %d != 93\n",
+               ast_test_status_update(test, "Object's 'joe' field does not have expected value: %u != 93\n",
                                obj->joe);
                return AST_TEST_FAIL;
        }
@@ -844,11 +844,11 @@ AST_TEST_DEFINE(object_filter)
        }
 
        if (obj->bob != 42) {
-               ast_test_status_update(test, "Object's 'bob' field does not have expected value: %d != 42\n",
+               ast_test_status_update(test, "Object's 'bob' field does not have expected value: %u != 42\n",
                                obj->bob);
                return AST_TEST_FAIL;
        } else if (obj->joe != 93) {
-               ast_test_status_update(test, "Object's 'joe' field does not have expected value: %d != 93\n",
+               ast_test_status_update(test, "Object's 'joe' field does not have expected value: %u != 93\n",
                                obj->joe);
                return AST_TEST_FAIL;
        }
index ab18302..4e0eb08 100644 (file)
@@ -130,7 +130,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  */
 #define VM_API_INT_VERIFY(expected, actual) do { \
        if ((expected) != (actual)) { \
-               ast_test_status_update(test, "Test failed for parameter %s: Expected [%d], Actual [%d]\n", #actual, expected, actual); \
+               ast_test_status_update(test, "Test failed for parameter %s: Expected [%d], Actual [%d]\n", #actual, (int)expected, (int)actual); \
                VM_API_SNAPSHOT_TEST_CLEANUP; \
                return AST_TEST_FAIL; \
        } } while (0)
@@ -458,9 +458,9 @@ static int test_vm_api_create_voicemail_files(const char *context, const char *m
         */
        snprintf(folder_path, sizeof(folder_path), "%s/voicemail/%s/%s/%s",
                ast_config_AST_SPOOL_DIR, context, mailbox, snapshot->folder_name);
-       snprintf(msg_path, sizeof(msg_path), "%s/msg%04d.txt",
+       snprintf(msg_path, sizeof(msg_path), "%s/msg%04u.txt",
                folder_path, snapshot->msg_number);
-       snprintf(snd_path, sizeof(snd_path), "%s/msg%04d.gsm",
+       snprintf(snd_path, sizeof(snd_path), "%s/msg%04u.gsm",
                folder_path, snapshot->msg_number);
        snprintf(beep_path, sizeof(beep_path), "%s/sounds/en/beep.gsm", ast_config_AST_VAR_DIR);
 
@@ -549,9 +549,9 @@ static void test_vm_api_remove_voicemail(struct ast_vm_msg_snapshot *snapshot)
        snprintf(folder_path, sizeof(folder_path), "%s/voicemail/%s/%s/%s",
                ast_config_AST_SPOOL_DIR, "default", snapshot->exten, snapshot->folder_name);
 
-       snprintf(msg_path, sizeof(msg_path), "%s/msg%04d.txt",
+       snprintf(msg_path, sizeof(msg_path), "%s/msg%04u.txt",
                        folder_path, snapshot->msg_number);
-       snprintf(snd_path, sizeof(snd_path), "%s/msg%04d.gsm",
+       snprintf(snd_path, sizeof(snd_path), "%s/msg%04u.gsm",
                        folder_path, snapshot->msg_number);
        unlink(msg_path);
        unlink(snd_path);