Changeset 1065dd4 for lib

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:

lib

Files:

• events.h (modified) (1 diff)
• events_glib.c (modified) (1 diff)
• events_libevent.c (modified) (1 diff)
• http_client.c (modified) (2 diffs)
• http_client.h (modified) (1 diff)
• ini.c (modified) (2 diffs)
• ini.h (modified) (1 diff)
• json.c (modified) (4 diffs)
• misc.c (modified) (5 diffs)
• misc.h (modified) (1 diff)
• proxy.c (modified) (1 diff)
• proxy.h (modified) (1 diff)
• ssl_client.h (modified) (1 diff)
• ssl_gnutls.c (modified) (2 diffs)
• ssl_nss.c (modified) (1 diff)
• ssl_openssl.c (modified) (2 diffs)
• url.c (modified) (1 diff)
• url.h (modified) (1 diff)

lib/events.h

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

lib/events_glib.c

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

lib/events_libevent.c

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

lib/http_client.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 
@@ -345 +345 @@
                 /* 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 ++;
                 

lib/http_client.h

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

lib/ini.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 #define BITLBEE_CORE
@@ -63 +63 @@
         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;

lib/ini.h

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

lib/json.c

@@ -53 +53 @@
 static unsigned char hex_value (json_char c)
 {
-   if (isdigit(c))
+   if (g_ascii_isdigit(c))
       return c - '0';
 
@@ -609 +609 @@
                      default:
 
-                        if (isdigit (b) || b == '-')
+                        if (g_ascii_isdigit (b) || b == '-')
                         {
                            if (!new_value (&state, &top, &root, &alloc, json_integer))
@@ -616 +616 @@
                            if (!state.first_pass)
                            {
-                              while (isdigit (b) || b == '+' || b == '-'
+                              while (g_ascii_isdigit (b) || b == '+' || b == '-'
                                         || b == 'e' || b == 'E' || b == '.')
                               {
@@ -706 +706 @@
             case json_double:
 
-               if (isdigit (b))
+               if (g_ascii_isdigit (b))
                {
                   ++ num_digits;

lib/misc.c

@@ -27 +27 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 
@@ -163 +163 @@
         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
@@ -198 +198 @@
                 {
                         cs = ++in;
-                        while( *in && isalpha( *in ) )
+                        while( *in && g_ascii_isalpha( *in ) )
                                 in ++;
                         
@@ -314 +314 @@
         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' ) ||
@@ -490 +490 @@
         
         while( *value )
-                if( !isdigit( *value ) )
+                if( !g_ascii_isdigit( *value ) )
                         return 0;
                 else

lib/misc.h

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

lib/proxy.c

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

lib/proxy.h

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

lib/ssl_client.h

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

lib/ssl_gnutls.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 
@@ -318 +318 @@
         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 ) );

lib/ssl_nss.c

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

lib/ssl_openssl.c

@@ -20 +20 @@
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin St.,
+  Fifth Floor, Boston, MA  02110-1301  USA
 */
 
@@ -159 +159 @@
         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 );
         

lib/url.c

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

lib/url.h

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