pidgin/android/libpurple

MXit: Refactor dump_bytes() not to use a C99-style variable length array.
release-2.x.y
2013-04-03, Andrew Victor
7cd76ebbe8d1
Parents de99b599db24
Children 07ffa66fd57b5ce3fe28942f
MXit: Refactor dump_bytes() not to use a C99-style variable length array.

* Removes warning when compiling for InstantBird:
protocol.c:103:1: warning: ISO C90 forbids variable length array ‘request’ [-Wvla]

* Characters > 0x7E should also be treated as non-printable.
1 files changed, 11 insertions(+), 10 deletions(-)
  • +11 -10
    libpurple/protocols/mxit/protocol.c
    • --- a/libpurple/protocols/mxit/protocol.c Wed Apr 03 00:53:35 2013 +0200
    +++ b/libpurple/protocols/mxit/protocol.c Wed Apr 03 01:25:40 2013 +0200
    @@ -100,26 +100,27 @@
    */
    void dump_bytes( struct MXitSession* session, const char* buf, int len )
    {
    - char msg[( len * 3 ) + 1];
    - int i;
    -
    - memset( msg, 0x00, sizeof( msg ) );
    + char* msg = g_malloc0( len + 1 );
    + int i;
    for ( i = 0; i < len; i++ ) {
    - if ( buf[i] == CP_REC_TERM ) /* record terminator */
    + char ch = buf[i];
    +
    + if ( ch == CP_REC_TERM ) /* record terminator */
    msg[i] = '!';
    - else if ( buf[i] == CP_FLD_TERM ) /* field terminator */
    + else if ( ch == CP_FLD_TERM ) /* field terminator */
    msg[i] = '^';
    - else if ( buf[i] == CP_PKT_TERM ) /* packet terminator */
    + else if ( ch == CP_PKT_TERM ) /* packet terminator */
    msg[i] = '@';
    - else if ( buf[i] < 0x20 )
    + else if ( ( ch < 0x20 ) || ( ch > 0x7E ) ) /* non-printable character */
    msg[i] = '_';
    else
    - msg[i] = buf[i];
    -
    + msg[i] = ch;
    }
    purple_debug_info( MXIT_PLUGIN_ID, "DUMP: '%s'\n", msg );
    +
    + g_free( msg );
    }