Changeset 1065dd4 for protocols


Ignore:
Timestamp:
2015-01-17T20:00:49Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
eb4ad8d
Parents:
bc7a0d4 (diff), 6b13103 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge cleanup changes. (FSF address fix, and using GLib variants of some
functions which cleans up compiler warnings.)

Location:
protocols
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • protocols/account.c

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525
    … …  
    8181        if( strcmp( prpl->name, "oscar" ) == 0 )
    8282        {
    83                 if( isdigit( a->user[0] ) )
     83                if( g_ascii_isdigit( a->user[0] ) )
    8484                        strcpy( tag, "icq" );
    8585                else
    … …  
    417417       
    418418        /* Format: /[0-9]+([*+][0-9]+(<[0-9+])?)?/ */
    419         while( *value && isdigit( *value ) )
     419        while( *value && g_ascii_isdigit( *value ) )
    420420                p->start = p->start * 10 + *value++ - '0';
    421421       
    … …  
    433433       
    434434        /* + or * the delay by this number every time. */
    435         while( *value && isdigit( *value ) )
     435        while( *value && g_ascii_isdigit( *value ) )
    436436                p->step = p->step * 10 + *value++ - '0';
    437437       
    … …  
    444444        p->max = 0;
    445445        value ++;
    446         while( *value && isdigit( *value ) )
     446        while( *value && g_ascii_isdigit( *value ) )
    447447                p->max = p->max * 10 + *value++ - '0';
    448448       

  • protocols/account.h

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525

  • protocols/bee.c

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525

  • protocols/bee.h

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525

  • protocols/bee_chat.c

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525

  • protocols/bee_ft.c

    rbc7a0d4 r1065dd4  
    1818  You should have received a copy of the GNU General Public License with
    1919  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    20   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    21   Suite 330, Boston, MA  02111-1307  USA
     20  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     21  Fifth Floor, Boston, MA  02110-1301  USA
    2222*/
    2323

  • protocols/bee_user.c

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525

  • protocols/ft.h

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525

  • protocols/jabber/jabber_util.c

    rbc7a0d4 r1065dd4  
    321321                        return FALSE;
    322322                }
    323                 if( tolower( jid1[i] ) != tolower( jid2[i] ) )
     323                if( g_ascii_tolower( jid1[i] ) != g_ascii_tolower( jid2[i] ) )
    324324                {
    325325                        return FALSE;
    … …  
    342342           it's Unicode but feck Unicode. :-P So stop once we see a slash. */
    343343        for( i = 0; i < len && orig[i] != '/' ; i ++ )
    344                 new[i] = tolower( orig[i] );
     344                new[i] = g_ascii_tolower( orig[i] );
    345345        for( ; orig[i]; i ++ )
    346346                new[i] = orig[i];

  • protocols/jabber/sasl.c

    rbc7a0d4 r1065dd4  
    187187        len = strlen( field );
    188188       
    189         while( isspace( *data ) || *data == ',' )
     189        while( g_ascii_isspace( *data ) || *data == ',' )
    190190                data ++;
    191191       
    … …  
    210210                        if( data[i] == ',' )
    211211                        {
    212                                 while( isspace( data[i] ) || data[i] == ',' )
     212                                while( g_ascii_isspace( data[i] ) || data[i] == ',' )
    213213                                        i ++;
    214214                               

  • protocols/msn/invitation.c

    rbc7a0d4 r1065dd4  
    2121 You should have received a copy of the GNU General Public License with
    2222 the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    23  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    24  Suite 330, Boston, MA  02111-1307  USA
     23 if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     24 Fifth Floor, Boston, MA  02110-1301  USA
    2525 */
    2626

  • protocols/msn/invitation.h

    rbc7a0d4 r1065dd4  
    2020 You should have received a copy of the GNU General Public License with
    2121 the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23  Suite 330, Boston, MA  02111-1307  USA
     22 if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23 Fifth Floor, Boston, MA  02110-1301  USA
    2424 */
    2525

  • protocols/msn/msn.c

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525
    … …  
    377377        g_tree_insert( md->domaintree, bu->handle, bu );
    378378       
    379         for( handle = bu->handle; isdigit( *handle ); handle ++ );
     379        for( handle = bu->handle; g_ascii_isdigit( *handle ); handle ++ );
    380380        if( *handle == ':' )
    381381        {

  • protocols/msn/msn.h

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525

  • protocols/msn/msn_util.c

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525

  • protocols/msn/ns.c

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525
    … …  
    581581                ic->flags |= OPT_PONGED;
    582582        }
    583         else if( isdigit( cmd[0][0] ) )
     583        else if( g_ascii_isdigit( cmd[0][0] ) )
    584584        {
    585585                int num = atoi( cmd[0] );
    … …  
    997997        /* This might be a federated contact. Get its network number,
    998998           prefixed to bu->handle with a colon. Default is 1. */
    999         for( handle = bu->handle; isdigit( *handle ); handle ++ )
     999        for( handle = bu->handle; g_ascii_isdigit( *handle ); handle ++ )
    10001000                type = type * 10 + *handle - '0';
    10011001        if( *handle == ':' )

  • protocols/msn/sb.c

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525
    … …  
    506506        else if( strcmp( cmd[0], "CAL" ) == 0 )
    507507        {
    508                 if( num_parts < 4 || !isdigit( cmd[3][0] ) )
     508                if( num_parts < 4 || !g_ascii_isdigit( cmd[3][0] ) )
    509509                {
    510510                        msn_sb_destroy( sb );
    … …  
    645645                }
    646646        }
    647         else if( isdigit( cmd[0][0] ) )
     647        else if( g_ascii_isdigit( cmd[0][0] ) )
    648648        {
    649649                int num = atoi( cmd[0] );

  • protocols/msn/soap.c

    rbc7a0d4 r1065dd4  
    2323  You should have received a copy of the GNU General Public License with
    2424  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    25   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    26   Suite 330, Boston, MA  02111-1307  USA
     25  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     26  Fifth Floor, Boston, MA  02110-1301  USA
    2727*/
    2828

  • protocols/msn/soap.h

    rbc7a0d4 r1065dd4  
    2323  You should have received a copy of the GNU General Public License with
    2424  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    25   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    26   Suite 330, Boston, MA  02111-1307  USA
     25  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     26  Fifth Floor, Boston, MA  02110-1301  USA
    2727*/
    2828

  • protocols/msn/tables.c

    rbc7a0d4 r1065dd4  
    2020  You should have received a copy of the GNU General Public License with
    2121  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    22   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    23   Suite 330, Boston, MA  02111-1307  USA
     22  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     23  Fifth Floor, Boston, MA  02110-1301  USA
    2424*/
    2525

  • protocols/nogaim.c

    rbc7a0d4 r1065dd4  
    2828  You should have received a copy of the GNU General Public License with
    2929  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    30   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    31   Suite 330, Boston, MA  02111-1307  USA
     30  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     31  Fifth Floor, Boston, MA  02110-1301  USA
    3232*/
    3333

  • protocols/nogaim.h

    rbc7a0d4 r1065dd4  
    3232  You should have received a copy of the GNU General Public License with
    3333  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    34   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    35   Suite 330, Boston, MA  02111-1307  USA
     34  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     35  Fifth Floor, Boston, MA  02110-1301  USA
    3636*/
    3737

  • protocols/oscar/auth.c

    rbc7a0d4 r1065dd4  
    125125                return -EINVAL;
    126126
    127         if (isdigit(sn[0]) && set_getbool(&ic->acc->set, "old_icq_auth"))
     127        if (g_ascii_isdigit(sn[0]) && set_getbool(&ic->acc->set, "old_icq_auth"))
    128128                return goddamnicq(sess, conn, sn);
    129129

  • protocols/oscar/oscar.c

    rbc7a0d4 r1065dd4  
    1919 * You should have received a copy of the GNU General Public License
    2020 * along with this program; if not, write to the Free Software
    21  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    2222 *
    2323 */
    … …  
    368368{
    369369        set_t *s;
    370         gboolean icq = isdigit(acc->user[0]);
     370        gboolean icq = g_ascii_isdigit(acc->user[0]);
    371371       
    372372        if (icq) {
    … …  
    394394        struct oscar_data *odata = ic->proto_data = g_new0(struct oscar_data, 1);
    395395
    396         if (isdigit(acc->user[0]))
     396        if (g_ascii_isdigit(acc->user[0]))
    397397                odata->icq = TRUE;
    398398        else
    … …  
    25002500        char * chatname, *s;
    25012501       
    2502         chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "",
     2502        chatname = g_strdup_printf("%s%s%d", g_ascii_isdigit(*ic->acc->user) ? "icq" : "",
    25032503                                   ic->acc->user, chat_id++);
    25042504       
    25052505        for (s = chatname; *s; s ++)
    2506                 if (!isalnum(*s))
     2506                if (!g_ascii_isalnum(*s))
    25072507                        *s = '0';
    25082508       

  • protocols/oscar/oscar_util.c

    rbc7a0d4 r1065dd4  
    5757                                curPtr2++;
    5858                } else {
    59                         if ( toupper(*curPtr1) != toupper(*curPtr2))
     59                        if ( g_ascii_toupper(*curPtr1) != g_ascii_toupper(*curPtr2))
    6060                                return 1;
    6161                        curPtr1++;

  • protocols/purple/purple.c

    rbc7a0d4 r1065dd4  
    6161                while( *a == '_' ) a ++;
    6262                while( *b == '_' ) b ++;
    63                 if( tolower( *a ) != tolower( *b ) )
     63                if( g_ascii_tolower( *a ) != g_ascii_tolower( *b ) )
    6464                        return FALSE;
    6565               
    … …  
    11481148                                {
    11491149                                        n = strlen( value ) - 1;
    1150                                         while( isspace( value[n] ) )
     1150                                        while( g_ascii_isspace( value[n] ) )
    11511151                                                n --;
    11521152                                        g_string_append_len( info, value, n + 1 );

  • protocols/skype/skype.c

    rbc7a0d4 r1065dd4  
    1616 *  You should have received a copy of the GNU General Public License
    1717 *  along with this program; if not, write to the Free Software
    18  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
     18 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    1919 *  USA.
    2020 */
    … …  
    514514                                char *iptr = sd->info_sex;
    515515                                while (*iptr++)
    516                                         *iptr = tolower(*iptr);
     516                                        *iptr = g_ascii_tolower(*iptr);
    517517                                g_string_append_printf(st,
    518518                                        "Gender: %s\n", sd->info_sex);

  • protocols/twitter/twitter.c

    rbc7a0d4 r1065dd4  
    459459
    460460                        strcpy(pin, message);
    461                         for (s = pin + sizeof(pin) - 2; s > pin && isspace(*s); s--)
     461                        for (s = pin + sizeof(pin) - 2; s > pin && g_ascii_isspace(*s); s--)
    462462                                *s = '\0';
    463                         for (s = pin; *s && isspace(*s); s++) {
     463                        for (s = pin; *s && g_ascii_isspace(*s); s++) {
    464464                        }
    465465

  • protocols/yahoo/libyahoo2.c

    rbc7a0d4 r1065dd4  
    4444 * You should have received a copy of the GNU General Public License
    4545 * along with this program; if not, write to the Free Software
    46  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     46 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    4747 *
    4848 */

  • protocols/yahoo/yahoo.c

    rbc7a0d4 r1065dd4  
    1616 * You should have received a copy of the GNU General Public License
    1717 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    1919 *
    2020 */

  • protocols/yahoo/yahoo2.h

    rbc7a0d4 r1065dd4  
    1616 * You should have received a copy of the GNU General Public License
    1717 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    1919 *
    2020 */

  • protocols/yahoo/yahoo2_callbacks.h

    rbc7a0d4 r1065dd4  
    1616 * You should have received a copy of the GNU General Public License
    1717 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    1919 *
    2020 */

  • protocols/yahoo/yahoo2_types.h

    rbc7a0d4 r1065dd4  
    1616 * You should have received a copy of the GNU General Public License
    1717 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    1919 *
    2020 */

  • protocols/yahoo/yahoo_debug.h

    rbc7a0d4 r1065dd4  
    1616 * You should have received a copy of the GNU General Public License
    1717 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    1919 *
    2020 */

  • protocols/yahoo/yahoo_httplib.c

    rbc7a0d4 r1065dd4  
    1616 * You should have received a copy of the GNU General Public License
    1717 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    1919 *
    2020 */
    … …  
    152152static int isurlchar(unsigned char c)
    153153{
    154         return (isalnum(c));
     154        return (g_ascii_isalnum(c));
    155155}
    156156

  • protocols/yahoo/yahoo_httplib.h

    rbc7a0d4 r1065dd4  
    1616 * You should have received a copy of the GNU General Public License
    1717 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    1919 *
    2020 */

  • protocols/yahoo/yahoo_list.h

    rbc7a0d4 r1065dd4  
    1717 * You should have received a copy of the GNU General Public License
    1818 * along with this program; if not, write to the Free Software
    19  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    2020 *
    2121 */

  • protocols/yahoo/yahoo_util.c

    rbc7a0d4 r1065dd4  
    1616 * You should have received a copy of the GNU General Public License
    1717 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    1919 *
    2020 */

  • protocols/yahoo/yahoo_util.h

    rbc7a0d4 r1065dd4  
    1616 * You should have received a copy of the GNU General Public License
    1717 * along with this program; if not, write to the Free Software
    18  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    1919 *
    2020 */
Note: See TracChangeset for help on using the changeset viewer.