Changeset 5113 for pjproject/trunk

Timestamp:

Jun 22, 2015 2:59:23 AM (9 years ago)

Author:

ming

Message:

Re #1843 (misc): Fixed warning: address of struct will always evaluate to 'true' [-Wpointer-bool-conversion]

Location:

pjproject/trunk/pjlib-util/src/pjlib-util

Files:

• cli_console.c (modified) (2 diffs)
• cli_telnet.c (modified) (2 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/cli_console.c

@@ -286 +286 @@
     /* Get the max length of the command name */
     for (i=0;i<info->hint_cnt;++i) {
-        if ((&hint[i].type) && (hint[i].type.slen > 0)) {
+        if (hint[i].type.slen > 0) {
             if (pj_stricmp(&hint[i].type, &sc_type) == 0) {
                 if ((i > 0) && (!pj_stricmp(&hint[i-1].desc, &hint[i].desc))) {
@@ -307 +307 @@
     cmd_length = 0;
     for (i=0;i<info->hint_cnt;++i) {
-        if ((&hint[i].type) && (hint[i].type.slen > 0)) {
+        if (hint[i].type.slen > 0) {
             if (pj_stricmp(&hint[i].type, &sc_type) == 0) {
                 parse_state = OP_SHORTCUT;

pjproject/trunk/pjlib-util/src/pjlib-util/cli_telnet.c

@@ -786 +786 @@
     /* Get the max length of the command name */
     for (i=0;i<info->hint_cnt;++i) {
-        if ((&hint[i].type) && (hint[i].type.slen > 0)) {
+        if (hint[i].type.slen > 0) {
             if (pj_stricmp(&hint[i].type, &sc_type) == 0) {
                 if ((i > 0) && (!pj_stricmp(&hint[i-1].desc, &hint[i].desc))) {
@@ -808 +808 @@
     /* Build hint information */
     for (i=0;i<info->hint_cnt;++i) {
-        if ((&hint[i].type) && (hint[i].type.slen > 0)) {
+        if (hint[i].type.slen > 0) {
             if (pj_stricmp(&hint[i].type, &sc_type) == 0) {
                 parse_state = OP_SHORTCUT;