diff options
-rw-r--r-- | dcc.c | 2 | ||||
-rw-r--r-- | irc_channel.c | 4 | ||||
-rw-r--r-- | irc_im.c | 4 | ||||
-rw-r--r-- | irc_util.c | 8 | ||||
-rw-r--r-- | lib/http_client.c | 4 | ||||
-rw-r--r-- | lib/ini.c | 4 | ||||
-rw-r--r-- | lib/json.c | 8 | ||||
-rw-r--r-- | lib/misc.c | 8 | ||||
-rw-r--r-- | lib/ssl_gnutls.c | 2 | ||||
-rw-r--r-- | lib/ssl_openssl.c | 2 | ||||
-rw-r--r-- | nick.c | 10 | ||||
-rw-r--r-- | otr.c | 6 | ||||
-rw-r--r-- | protocols/account.c | 8 | ||||
-rw-r--r-- | protocols/jabber/jabber_util.c | 4 | ||||
-rw-r--r-- | protocols/jabber/sasl.c | 4 | ||||
-rw-r--r-- | protocols/msn/msn.c | 2 | ||||
-rw-r--r-- | protocols/msn/ns.c | 4 | ||||
-rw-r--r-- | protocols/msn/sb.c | 4 | ||||
-rw-r--r-- | protocols/oscar/auth.c | 2 | ||||
-rw-r--r-- | protocols/oscar/oscar.c | 8 | ||||
-rw-r--r-- | protocols/oscar/oscar_util.c | 2 | ||||
-rw-r--r-- | protocols/purple/purple.c | 4 | ||||
-rw-r--r-- | protocols/skype/skype.c | 2 | ||||
-rw-r--r-- | protocols/twitter/twitter.c | 4 | ||||
-rw-r--r-- | protocols/yahoo/yahoo_httplib.c | 2 | ||||
-rw-r--r-- | set.c | 2 |
26 files changed, 57 insertions, 57 deletions
@@ -522,7 +522,7 @@ file_transfer_t *dcc_request( struct im_connection *ic, char* const* ctcp ) filename = ctcp[2]; host = ctcp[3]; - while( *host && isdigit( *host ) ) host++; /* Just digits? */ + while( *host && g_ascii_isdigit( *host ) ) host++; /* Just digits? */ if( *host == '\0' ) { struct in_addr ipaddr = { .s_addr = htonl( atoll( ctcp[3] ) ) }; diff --git a/irc_channel.c b/irc_channel.c index 05a3e0cf..0a6e11d2 100644 --- a/irc_channel.c +++ b/irc_channel.c @@ -574,7 +574,7 @@ static gboolean control_channel_privmsg( irc_channel_t *ic, const char *msg ) const char *s; /* Scan for non-whitespace chars followed by a colon: */ - for( s = msg; *s && !isspace( *s ) && *s != ':' && *s != ','; s ++ ) {} + for( s = msg; *s && !g_ascii_isspace( *s ) && *s != ':' && *s != ','; s ++ ) {} if( *s == ':' || *s == ',' ) { @@ -582,7 +582,7 @@ static gboolean control_channel_privmsg( irc_channel_t *ic, const char *msg ) memset( to, 0, sizeof( to ) ); strncpy( to, msg, s - msg ); - while( *(++s) && isspace( *s ) ) {} + while( *(++s) && g_ascii_isspace( *s ) ) {} msg = s; if( !( iu = irc_user_by_name( irc, to ) ) ) @@ -72,7 +72,7 @@ static gboolean bee_irc_user_new( bee_t *bee, bee_user_t *bu ) else { char *s; - for( s = bu->ic->acc->tag; isalnum( *s ); s ++ ); + for( s = bu->ic->acc->tag; g_ascii_isalnum( *s ); s ++ ); /* Only use the tag if we got to the end of the string. (So allow alphanumerics only. Hopefully not too restrictive.) */ @@ -315,7 +315,7 @@ static gboolean bee_irc_user_fullname( bee_t *bee, bee_user_t *bu ) /* Strip newlines (unlikely, but IRC-unfriendly so they must go) TODO(wilmer): Do the same with away msgs again! */ for( s = iu->fullname; *s; s ++ ) - if( isspace( *s ) ) *s = ' '; + if( g_ascii_isspace( *s ) ) *s = ' '; if( ( bu->ic->flags & OPT_LOGGED_IN ) && set_getbool( &bee->set, "display_namechanges" ) ) { @@ -41,9 +41,9 @@ char *set_eval_timezone( set_t *set, char *value ) s ++; /* \d+ */ - if( !isdigit( *s ) ) + if( !g_ascii_isdigit( *s ) ) return SET_INVALID; - while( *s && isdigit( *s ) ) s ++; + while( *s && g_ascii_isdigit( *s ) ) s ++; /* EOS? */ if( *s == '\0' ) @@ -55,9 +55,9 @@ char *set_eval_timezone( set_t *set, char *value ) s ++; /* \d+ */ - if( !isdigit( *s ) ) + if( !g_ascii_isdigit( *s ) ) return SET_INVALID; - while( *s && isdigit( *s ) ) s ++; + while( *s && g_ascii_isdigit( *s ) ) s ++; /* EOS */ return *s == '\0' ? value : SET_INVALID; diff --git a/lib/http_client.c b/lib/http_client.c index 49498f74..2481997a 100644 --- a/lib/http_client.c +++ b/lib/http_client.c @@ -344,12 +344,12 @@ static http_ret_t http_process_chunked_data( struct http_request *req, const cha /* Might be a \r\n from the last chunk. */ s = chunk; - while( isspace( *s ) ) + while( g_ascii_isspace( *s ) ) s ++; /* Chunk length. Might be incomplete. */ if( s < eos && sscanf( s, "%x", &clen ) != 1 ) return CR_ERROR; - while( isxdigit( *s ) ) + while( g_ascii_isxdigit( *s ) ) s ++; /* If we read anything here, it *must* be \r\n. */ @@ -62,11 +62,11 @@ static char *ini_strip_whitespace( char *in ) { char *e; - while( isspace( *in ) ) + while( g_ascii_isspace( *in ) ) in++; e = in + strlen( in ) - 1; - while( e > in && isspace( *e ) ) + while( e > in && g_ascii_isspace( *e ) ) e--; e[1] = 0; @@ -52,7 +52,7 @@ typedef unsigned int json_uchar; static unsigned char hex_value (json_char c) { - if (isdigit(c)) + if (g_ascii_isdigit(c)) return c - '0'; switch (c) { @@ -608,14 +608,14 @@ json_value * json_parse_ex (json_settings * settings, default: - if (isdigit (b) || b == '-') + if (g_ascii_isdigit (b) || b == '-') { if (!new_value (&state, &top, &root, &alloc, json_integer)) goto e_alloc_failure; if (!state.first_pass) { - while (isdigit (b) || b == '+' || b == '-' + while (g_ascii_isdigit (b) || b == '+' || b == '-' || b == 'e' || b == 'E' || b == '.') { if ( (++ i) == end) @@ -705,7 +705,7 @@ json_value * json_parse_ex (json_settings * settings, case json_integer: case json_double: - if (isdigit (b)) + if (g_ascii_isdigit (b)) { ++ num_digits; @@ -162,7 +162,7 @@ void strip_html( char *in ) while( *in ) { - if( *in == '<' && ( isalpha( *(in+1) ) || *(in+1) == '/' ) ) + if( *in == '<' && ( g_ascii_isalpha( *(in+1) ) || *(in+1) == '/' ) ) { /* If in points at a < and in+1 points at a letter or a slash, this is probably a HTML-tag. Try to find a closing > and continue there. If the > can't be @@ -197,7 +197,7 @@ void strip_html( char *in ) else if( *in == '&' ) { cs = ++in; - while( *in && isalpha( *in ) ) + while( *in && g_ascii_isalpha( *in ) ) in ++; if( *in == ';' ) in ++; @@ -313,7 +313,7 @@ void http_encode( char *s ) strcpy( t, s ); for( i = j = 0; t[i]; i ++, j ++ ) { - /* Warning: isalnum() is locale-aware, so don't use it here! */ + /* Warning: g_ascii_isalnum() is locale-aware, so don't use it here! */ if( ( t[i] >= 'A' && t[i] <= 'Z' ) || ( t[i] >= 'a' && t[i] <= 'z' ) || ( t[i] >= '0' && t[i] <= '9' ) || @@ -489,7 +489,7 @@ int is_bool( char *value ) return 1; while( *value ) - if( !isdigit( *value ) ) + if( !g_ascii_isdigit( *value ) ) return 0; else value ++; diff --git a/lib/ssl_gnutls.c b/lib/ssl_gnutls.c index 0aea6b0e..fade7de2 100644 --- a/lib/ssl_gnutls.c +++ b/lib/ssl_gnutls.c @@ -317,7 +317,7 @@ static gboolean ssl_connected( gpointer data, gint source, b_input_condition con #endif gnutls_set_default_priority( conn->session ); gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, xcred ); - if( conn->hostname && !isdigit( conn->hostname[0] ) ) + if( conn->hostname && !g_ascii_isdigit( conn->hostname[0] ) ) gnutls_server_name_set( conn->session, GNUTLS_NAME_DNS, conn->hostname, strlen( conn->hostname ) ); diff --git a/lib/ssl_openssl.c b/lib/ssl_openssl.c index 206c73e7..63937380 100644 --- a/lib/ssl_openssl.c +++ b/lib/ssl_openssl.c @@ -158,7 +158,7 @@ static gboolean ssl_connected( gpointer data, gint source, b_input_condition con sock_make_nonblocking( conn->fd ); SSL_set_fd( conn->ssl, conn->fd ); - if( conn->hostname && !isdigit( conn->hostname[0] ) ) + if( conn->hostname && !g_ascii_isdigit( conn->hostname[0] ) ) SSL_set_tlsext_host_name( conn->ssl, conn->hostname ); return ssl_handshake( data, source, cond ); @@ -40,7 +40,7 @@ static char *clean_handle( const char *orig ) do { if (*orig != ' ') - new[i++] = tolower( *orig ); + new[i++] = g_ascii_tolower( *orig ); } while (*(orig++)); @@ -143,11 +143,11 @@ char *nick_gen( bee_user_t *bu ) } fmt += 2; } - else if( isdigit( *fmt ) ) + else if( g_ascii_isdigit( *fmt ) ) { len = 0; /* Grab a number. */ - while( isdigit( *fmt ) ) + while( g_ascii_isdigit( *fmt ) ) len = len * 10 + ( *(fmt++) - '0' ); } else if( g_strncasecmp( fmt, "nick", 4 ) == 0 ) @@ -330,7 +330,7 @@ void nick_strip( irc_t *irc, char *nick ) } } } - if( isdigit( nick[0] ) ) + if( g_ascii_isdigit( nick[0] ) ) { char *orig; @@ -350,7 +350,7 @@ gboolean nick_ok( irc_t *irc, const char *nick ) const char *s; /* Empty/long nicks are not allowed, nor numbers at [0] */ - if( !*nick || isdigit( nick[0] ) || strlen( nick ) > MAX_NICK_LENGTH ) + if( !*nick || g_ascii_isdigit( nick[0] ) || strlen( nick ) > MAX_NICK_LENGTH ) return 0; if( irc && ( irc->status & IRC_UTF8_NICKS ) ) @@ -1469,7 +1469,7 @@ irc_user_t *peeruser(irc_t *irc, const char *handle, const char *protocol) int hexval(char a) { - int x=tolower(a); + int x=g_ascii_tolower(a); if(x>='a' && x<='f') x = x - 'a' + 10; @@ -1556,7 +1556,7 @@ Fingerprint *match_fingerprint(irc_t *irc, ConnContext *ctx, const char **args) p=prefix; for(i=0; args[i]; i++) { for(j=0; args[i][j]; j++) { - char c = toupper(args[i][j]); + char c = g_ascii_toupper(args[i][j]); if(n>=40) { irc_rootmsg(irc, "too many fingerprint digits given, expected at most 40"); @@ -1620,7 +1620,7 @@ OtrlPrivKey *match_privkey(irc_t *irc, const char **args) p=prefix; for(i=0; args[i]; i++) { for(j=0; args[i][j]; j++) { - char c = toupper(args[i][j]); + char c = g_ascii_toupper(args[i][j]); if(n>=40) { irc_rootmsg(irc, "too many fingerprint digits given, expected at most 40"); diff --git a/protocols/account.c b/protocols/account.c index 3f6fe3a6..188e362e 100644 --- a/protocols/account.c +++ b/protocols/account.c @@ -80,7 +80,7 @@ account_t *account_add( bee_t *bee, struct prpl *prpl, char *user, char *pass ) strcpy( tag, prpl->name ); if( strcmp( prpl->name, "oscar" ) == 0 ) { - if( isdigit( a->user[0] ) ) + if( g_ascii_isdigit( a->user[0] ) ) strcpy( tag, "icq" ); else strcpy( tag, "aim" ); @@ -416,7 +416,7 @@ int account_reconnect_delay_parse( char *value, struct account_reconnect_delay * p->max = 86400; /* Format: /[0-9]+([*+][0-9]+(<[0-9+])?)?/ */ - while( *value && isdigit( *value ) ) + while( *value && g_ascii_isdigit( *value ) ) p->start = p->start * 10 + *value++ - '0'; /* Sure, call me evil for implementing my own fscanf here, but it's @@ -432,7 +432,7 @@ int account_reconnect_delay_parse( char *value, struct account_reconnect_delay * p->op = *value++; /* + or * the delay by this number every time. */ - while( *value && isdigit( *value ) ) + while( *value && g_ascii_isdigit( *value ) ) p->step = p->step * 10 + *value++ - '0'; if( *value == 0 ) @@ -443,7 +443,7 @@ int account_reconnect_delay_parse( char *value, struct account_reconnect_delay * p->max = 0; value ++; - while( *value && isdigit( *value ) ) + while( *value && g_ascii_isdigit( *value ) ) p->max = p->max * 10 + *value++ - '0'; return p->max > 0; diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c index fb68c33d..9d8011f8 100644 --- a/protocols/jabber/jabber_util.c +++ b/protocols/jabber/jabber_util.c @@ -320,7 +320,7 @@ int jabber_compare_jid( const char *jid1, const char *jid2 ) break; return FALSE; } - if( tolower( jid1[i] ) != tolower( jid2[i] ) ) + if( g_ascii_tolower( jid1[i] ) != g_ascii_tolower( jid2[i] ) ) { return FALSE; } @@ -341,7 +341,7 @@ char *jabber_normalize( const char *orig ) /* So it turns out the /resource part is case sensitive. Yeah, and it's Unicode but feck Unicode. :-P So stop once we see a slash. */ for( i = 0; i < len && orig[i] != '/' ; i ++ ) - new[i] = tolower( orig[i] ); + new[i] = g_ascii_tolower( orig[i] ); for( ; orig[i]; i ++ ) new[i] = orig[i]; diff --git a/protocols/jabber/sasl.c b/protocols/jabber/sasl.c index a4d1f6c1..65da529a 100644 --- a/protocols/jabber/sasl.c +++ b/protocols/jabber/sasl.c @@ -186,7 +186,7 @@ char *sasl_get_part( char *data, char *field ) len = strlen( field ); - while( isspace( *data ) || *data == ',' ) + while( g_ascii_isspace( *data ) || *data == ',' ) data ++; if( g_strncasecmp( data, field, len ) == 0 && data[len] == '=' ) @@ -209,7 +209,7 @@ char *sasl_get_part( char *data, char *field ) find the next key after it. */ if( data[i] == ',' ) { - while( isspace( data[i] ) || data[i] == ',' ) + while( g_ascii_isspace( data[i] ) || data[i] == ',' ) i ++; if( g_strncasecmp( data + i, field, len ) == 0 && diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c index 808d41d3..65c19276 100644 --- a/protocols/msn/msn.c +++ b/protocols/msn/msn.c @@ -376,7 +376,7 @@ static void msn_buddy_data_add( bee_user_t *bu ) bd = bu->data = g_new0( struct msn_buddy_data, 1 ); g_tree_insert( md->domaintree, bu->handle, bu ); - for( handle = bu->handle; isdigit( *handle ); handle ++ ); + for( handle = bu->handle; g_ascii_isdigit( *handle ); handle ++ ); if( *handle == ':' ) { /* Pass a nick hint so hopefully the stupid numeric prefix diff --git a/protocols/msn/ns.c b/protocols/msn/ns.c index 5c7e3ff4..c4b6c462 100644 --- a/protocols/msn/ns.c +++ b/protocols/msn/ns.c @@ -580,7 +580,7 @@ static int msn_ns_command( struct msn_handler_data *handler, char **cmd, int num { ic->flags |= OPT_PONGED; } - else if( isdigit( cmd[0][0] ) ) + else if( g_ascii_isdigit( cmd[0][0] ) ) { int num = atoi( cmd[0] ); const struct msn_status_code *err = msn_status_by_number( num ); @@ -996,7 +996,7 @@ int msn_ns_sendmessage( struct im_connection *ic, bee_user_t *bu, const char *te /* This might be a federated contact. Get its network number, prefixed to bu->handle with a colon. Default is 1. */ - for( handle = bu->handle; isdigit( *handle ); handle ++ ) + for( handle = bu->handle; g_ascii_isdigit( *handle ); handle ++ ) type = type * 10 + *handle - '0'; if( *handle == ':' ) handle ++; diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c index ac7182fb..40e4e00d 100644 --- a/protocols/msn/sb.c +++ b/protocols/msn/sb.c @@ -505,7 +505,7 @@ static int msn_sb_command( struct msn_handler_data *handler, char **cmd, int num } else if( strcmp( cmd[0], "CAL" ) == 0 ) { - if( num_parts < 4 || !isdigit( cmd[3][0] ) ) + if( num_parts < 4 || !g_ascii_isdigit( cmd[3][0] ) ) { msn_sb_destroy( sb ); return( 0 ); @@ -644,7 +644,7 @@ static int msn_sb_command( struct msn_handler_data *handler, char **cmd, int num /* PANIC! */ } } - else if( isdigit( cmd[0][0] ) ) + else if( g_ascii_isdigit( cmd[0][0] ) ) { int num = atoi( cmd[0] ); const struct msn_status_code *err = msn_status_by_number( num ); diff --git a/protocols/oscar/auth.c b/protocols/oscar/auth.c index 0f7c8d0f..7a6b05d4 100644 --- a/protocols/oscar/auth.c +++ b/protocols/oscar/auth.c @@ -124,7 +124,7 @@ int aim_request_login(aim_session_t *sess, aim_conn_t *conn, const char *sn) if (!sess || !conn || !sn) return -EINVAL; - if (isdigit(sn[0]) && set_getbool(&ic->acc->set, "old_icq_auth")) + if (g_ascii_isdigit(sn[0]) && set_getbool(&ic->acc->set, "old_icq_auth")) return goddamnicq(sess, conn, sn); sess->flags |= AIM_SESS_FLAGS_SNACLOGIN; diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c index 7bf3ac3e..1c74e7a2 100644 --- a/protocols/oscar/oscar.c +++ b/protocols/oscar/oscar.c @@ -367,7 +367,7 @@ static gboolean oscar_login_connect(gpointer data, gint source, b_input_conditio static void oscar_init(account_t *acc) { set_t *s; - gboolean icq = isdigit(acc->user[0]); + gboolean icq = g_ascii_isdigit(acc->user[0]); if (icq) { set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc); @@ -393,7 +393,7 @@ static void oscar_login(account_t *acc) { struct im_connection *ic = imcb_new(acc); struct oscar_data *odata = ic->proto_data = g_new0(struct oscar_data, 1); - if (isdigit(acc->user[0])) + if (g_ascii_isdigit(acc->user[0])) odata->icq = TRUE; else ic->flags |= OPT_DOES_HTML; @@ -2499,11 +2499,11 @@ struct groupchat *oscar_chat_with(struct im_connection * ic, char *who) static int chat_id = 0; char * chatname, *s; - chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "", + chatname = g_strdup_printf("%s%s%d", g_ascii_isdigit(*ic->acc->user) ? "icq" : "", ic->acc->user, chat_id++); for (s = chatname; *s; s ++) - if (!isalnum(*s)) + if (!g_ascii_isalnum(*s)) *s = '0'; ret = oscar_chat_join_internal(ic, chatname, NULL, NULL, 4); diff --git a/protocols/oscar/oscar_util.c b/protocols/oscar/oscar_util.c index 7d41d383..806632ff 100644 --- a/protocols/oscar/oscar_util.c +++ b/protocols/oscar/oscar_util.c @@ -56,7 +56,7 @@ int aim_sncmp(const char *sn1, const char *sn2) if (*curPtr2 == ' ') curPtr2++; } else { - if ( toupper(*curPtr1) != toupper(*curPtr2)) + if ( g_ascii_toupper(*curPtr1) != g_ascii_toupper(*curPtr2)) return 1; curPtr1++; curPtr2++; diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c index 6e9682ed..97d2a4ae 100644 --- a/protocols/purple/purple.c +++ b/protocols/purple/purple.c @@ -60,7 +60,7 @@ static gboolean purple_menu_cmp( const char *a, const char *b ) { while( *a == '_' ) a ++; while( *b == '_' ) b ++; - if( tolower( *a ) != tolower( *b ) ) + if( g_ascii_tolower( *a ) != g_ascii_tolower( *b ) ) return FALSE; a ++; @@ -1147,7 +1147,7 @@ static void *prplcb_notify_userinfo( PurpleConnection *gc, const char *who, Purp if( value ) { n = strlen( value ) - 1; - while( isspace( value[n] ) ) + while( g_ascii_isspace( value[n] ) ) n --; g_string_append_len( info, value, n + 1 ); } diff --git a/protocols/skype/skype.c b/protocols/skype/skype.c index 8452aff9..20897d99 100644 --- a/protocols/skype/skype.c +++ b/protocols/skype/skype.c @@ -513,7 +513,7 @@ static void skype_parse_user(struct im_connection *ic, char *line) if (strlen(sd->info_sex)) { char *iptr = sd->info_sex; while (*iptr++) - *iptr = tolower(*iptr); + *iptr = g_ascii_tolower(*iptr); g_string_append_printf(st, "Gender: %s\n", sd->info_sex); } diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c index 2a6ae88f..ca32b3ce 100644 --- a/protocols/twitter/twitter.c +++ b/protocols/twitter/twitter.c @@ -458,9 +458,9 @@ static int twitter_buddy_msg(struct im_connection *ic, char *who, char *message, char pin[strlen(message) + 1], *s; strcpy(pin, message); - for (s = pin + sizeof(pin) - 2; s > pin && isspace(*s); s--) + for (s = pin + sizeof(pin) - 2; s > pin && g_ascii_isspace(*s); s--) *s = '\0'; - for (s = pin; *s && isspace(*s); s++) { + for (s = pin; *s && g_ascii_isspace(*s); s++) { } if (!oauth_access_token(s, td->oauth_info)) { diff --git a/protocols/yahoo/yahoo_httplib.c b/protocols/yahoo/yahoo_httplib.c index eaf319b8..ec153234 100644 --- a/protocols/yahoo/yahoo_httplib.c +++ b/protocols/yahoo/yahoo_httplib.c @@ -151,7 +151,7 @@ static int url_to_host_port_path(const char *url, static int isurlchar(unsigned char c) { - return (isalnum(c)); + return (g_ascii_isalnum(c)); } char *yahoo_urlencode(const char *instr) @@ -225,7 +225,7 @@ char *set_eval_int( set_t *set, char *value ) s ++; for( ; *s; s ++ ) - if( !isdigit( *s ) ) + if( !g_ascii_isdigit( *s ) ) return SET_INVALID; return value; |