Changeset 1065dd4 for lib


Ignore:
Timestamp:
2015-01-17T20:00:49Z (5 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:
lib
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • lib/events.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 */
  • lib/events_glib.c

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

    rbc7a0d4 r1065dd4  
    2222  You should have received a copy of the GNU General Public License with
    2323  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    24   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    25   Suite 330, Boston, MA  02111-1307  USA
     24  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     25  Fifth Floor, Boston, MA  02110-1301  USA
    2626*/
    2727
  • lib/http_client.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
     
    345345                /* Might be a \r\n from the last chunk. */
    346346                s = chunk;
    347                 while( isspace( *s ) )
     347                while( g_ascii_isspace( *s ) )
    348348                        s ++;
    349349                /* Chunk length. Might be incomplete. */
    350350                if( s < eos && sscanf( s, "%x", &clen ) != 1 )
    351351                        return CR_ERROR;
    352                 while( isxdigit( *s ) )
     352                while( g_ascii_isxdigit( *s ) )
    353353                        s ++;
    354354               
  • lib/http_client.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
  • lib/ini.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#define BITLBEE_CORE
     
    6363        char *e;
    6464
    65         while( isspace( *in ) )
     65        while( g_ascii_isspace( *in ) )
    6666                in++;
    6767
    6868        e = in + strlen( in ) - 1;
    69         while( e > in && isspace( *e ) )
     69        while( e > in && g_ascii_isspace( *e ) )
    7070                e--;
    7171        e[1] = 0;
  • lib/ini.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
  • lib/json.c

    rbc7a0d4 r1065dd4  
    5353static unsigned char hex_value (json_char c)
    5454{
    55    if (isdigit(c))
     55   if (g_ascii_isdigit(c))
    5656      return c - '0';
    5757
     
    609609                     default:
    610610
    611                         if (isdigit (b) || b == '-')
     611                        if (g_ascii_isdigit (b) || b == '-')
    612612                        {
    613613                           if (!new_value (&state, &top, &root, &alloc, json_integer))
     
    616616                           if (!state.first_pass)
    617617                           {
    618                               while (isdigit (b) || b == '+' || b == '-'
     618                              while (g_ascii_isdigit (b) || b == '+' || b == '-'
    619619                                        || b == 'e' || b == 'E' || b == '.')
    620620                              {
     
    706706            case json_double:
    707707
    708                if (isdigit (b))
     708               if (g_ascii_isdigit (b))
    709709               {
    710710                  ++ num_digits;
  • lib/misc.c

    rbc7a0d4 r1065dd4  
    2727  You should have received a copy of the GNU General Public License with
    2828  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    29   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    30   Suite 330, Boston, MA  02111-1307  USA
     29  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     30  Fifth Floor, Boston, MA  02110-1301  USA
    3131*/
    3232
     
    163163        while( *in )
    164164        {
    165                 if( *in == '<' && ( isalpha( *(in+1) ) || *(in+1) == '/' ) )
     165                if( *in == '<' && ( g_ascii_isalpha( *(in+1) ) || *(in+1) == '/' ) )
    166166                {
    167167                        /* If in points at a < and in+1 points at a letter or a slash, this is probably
     
    198198                {
    199199                        cs = ++in;
    200                         while( *in && isalpha( *in ) )
     200                        while( *in && g_ascii_isalpha( *in ) )
    201201                                in ++;
    202202                       
     
    314314        for( i = j = 0; t[i]; i ++, j ++ )
    315315        {
    316                 /* Warning: isalnum() is locale-aware, so don't use it here! */
     316                /* Warning: g_ascii_isalnum() is locale-aware, so don't use it here! */
    317317                if( ( t[i] >= 'A' && t[i] <= 'Z' ) ||
    318318                    ( t[i] >= 'a' && t[i] <= 'z' ) ||
     
    490490       
    491491        while( *value )
    492                 if( !isdigit( *value ) )
     492                if( !g_ascii_isdigit( *value ) )
    493493                        return 0;
    494494                else
  • lib/misc.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
  • lib/proxy.c

    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 */
  • lib/proxy.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 */
  • lib/ssl_client.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
  • lib/ssl_gnutls.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
     
    318318        gnutls_set_default_priority( conn->session );
    319319        gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, xcred );
    320         if( conn->hostname && !isdigit( conn->hostname[0] ) )
     320        if( conn->hostname && !g_ascii_isdigit( conn->hostname[0] ) )
    321321                gnutls_server_name_set( conn->session, GNUTLS_NAME_DNS,
    322322                                        conn->hostname, strlen( conn->hostname ) );
  • lib/ssl_nss.c

    rbc7a0d4 r1065dd4  
    2222  You should have received a copy of the GNU General Public License with
    2323  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
    24   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    25   Suite 330, Boston, MA  02111-1307  USA
     24  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
     25  Fifth Floor, Boston, MA  02110-1301  USA
    2626*/
    2727
  • lib/ssl_openssl.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
     
    159159        SSL_set_fd( conn->ssl, conn->fd );
    160160       
    161         if( conn->hostname && !isdigit( conn->hostname[0] ) )
     161        if( conn->hostname && !g_ascii_isdigit( conn->hostname[0] ) )
    162162                SSL_set_tlsext_host_name( conn->ssl, conn->hostname );
    163163       
  • lib/url.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
  • lib/url.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
Note: See TracChangeset for help on using the changeset viewer.