pidgin/purple-plugin-pack

Clean up some more 'ISO C90 forbids mixed declarations and code' warnings.

2010-12-04, John Bailey
cc3c895d2ffa
Parents fa2a61b3ed19
Children 44420c7dcf63
Clean up some more 'ISO C90 forbids mixed declarations and code' warnings.
2 files changed, 10 insertions(+), 8 deletions(-)
  • +3 -3
    autoprofile/comp_rss_parser.c
  • +7 -5
    capsnot/capsnot.c
    • --- a/autoprofile/comp_rss_parser.c Sat Dec 04 09:30:58 2010 -0500
    +++ b/autoprofile/comp_rss_parser.c Sat Dec 04 09:36:09 2010 -0500
    @@ -263,7 +263,7 @@
    const char *text, size_t size, const gchar *error_message)
    {
    GMarkupParseContext *context;
    - gchar *filtered_text;
    + gchar *filtered_text = NULL, *convert = NULL, *next = NULL;
    GError *err = NULL;
    GList *entries;
    struct widget *w = (struct widget *) data;
    @@ -290,8 +290,8 @@
    // Sanity checking
    filtered_text = purple_utf8_salvage (text);
    - gchar *convert = purple_utf8_try_convert ("<");
    - gchar *next = g_utf8_strchr (filtered_text, 10, g_utf8_get_char (convert));
    + *convert = purple_utf8_try_convert ("<");
    + *next = g_utf8_strchr (filtered_text, 10, g_utf8_get_char (convert));
    free (convert);
    if (next == NULL) {
    --- a/capsnot/capsnot.c Sat Dec 04 09:30:58 2010 -0500
    +++ b/capsnot/capsnot.c Sat Dec 04 09:36:09 2010 -0500
    @@ -60,15 +60,16 @@
    gboolean numlock;
    gboolean capslock;
    gboolean scrolllock;
    +#ifdef WIN32
    + BYTE keyState[256];
    + GetKeyboardState((LPBYTE) &keyState);
    +#endif
    numlock = purple_prefs_get_bool("/plugins/core/eionrobb-capsnot/numlock");
    capslock = purple_prefs_get_bool("/plugins/core/eionrobb-capsnot/capslock");
    scrolllock = purple_prefs_get_bool("/plugins/core/eionrobb-capsnot/scrolllock");
    #ifdef WIN32
    - BYTE keyState[256];
    - GetKeyboardState((LPBYTE) &keyState);
    -
    if (numlock)
    {
    if ((state && !(keyState[VK_NUMLOCK] & 1)) ||
    @@ -150,13 +151,14 @@
    gboolean has_unseen;
    gint flashcount;
    gint flashseconds;
    + const char *im = NULL, *chat = NULL;
    if( type != PURPLE_CONV_UPDATE_UNSEEN ) {
    return;
    }
    - const char *im = purple_prefs_get_string("/plugins/core/eionrobb-capsnot/im");
    - const char *chat = purple_prefs_get_string("/plugins/core/eionrobb-capsnot/chat");
    + *im = purple_prefs_get_string("/plugins/core/eionrobb-capsnot/im");
    + *chat = purple_prefs_get_string("/plugins/core/eionrobb-capsnot/chat");
    if (im && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
    {