aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/events.h2
-rw-r--r--lib/events_glib.c4
-rw-r--r--lib/events_libevent.c4
-rw-r--r--lib/http_client.c8
-rw-r--r--lib/http_client.h4
-rw-r--r--lib/ini.c8
-rw-r--r--lib/ini.h4
-rw-r--r--lib/json.c8
-rw-r--r--lib/misc.c12
-rw-r--r--lib/misc.h4
-rw-r--r--lib/proxy.c2
-rw-r--r--lib/proxy.h2
-rw-r--r--lib/ssl_client.h4
-rw-r--r--lib/ssl_gnutls.c6
-rw-r--r--lib/ssl_nss.c4
-rw-r--r--lib/ssl_openssl.c6
-rw-r--r--lib/url.c4
-rw-r--r--lib/url.h4
18 files changed, 45 insertions, 45 deletions
diff --git a/lib/events.h b/lib/events.h
index e31ddba4..0446aa0f 100644
--- a/lib/events.h
+++ b/lib/events.h
@@ -15,7 +15,7 @@
*
* 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
*
*/
diff --git a/lib/events_glib.c b/lib/events_glib.c
index 369d47f2..c6bb3d9e 100644
--- a/lib/events_glib.c
+++ b/lib/events_glib.c
@@ -21,8 +21,8 @@
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
diff --git a/lib/events_libevent.c b/lib/events_libevent.c
index 43d770ea..cf4eee8f 100644
--- a/lib/events_libevent.c
+++ b/lib/events_libevent.c
@@ -21,8 +21,8 @@
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
diff --git a/lib/http_client.c b/lib/http_client.c
index 590b8143..2481997a 100644
--- a/lib/http_client.c
+++ b/lib/http_client.c
@@ -19,8 +19,8 @@
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
*/
#include <string.h>
@@ -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. */
diff --git a/lib/http_client.h b/lib/http_client.h
index 1b86f228..99add28f 100644
--- a/lib/http_client.h
+++ b/lib/http_client.h
@@ -19,8 +19,8 @@
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
*/
/* http_client allows you to talk (asynchronously, again) to HTTP servers.
diff --git a/lib/ini.c b/lib/ini.c
index aa291bb2..3819e3da 100644
--- a/lib/ini.c
+++ b/lib/ini.c
@@ -19,8 +19,8 @@
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
#include "bitlbee.h"
@@ -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;
diff --git a/lib/ini.h b/lib/ini.h
index 6ae0bde5..290b8cc9 100644
--- a/lib/ini.h
+++ b/lib/ini.h
@@ -19,8 +19,8 @@
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
*/
#ifndef _INI_H
diff --git a/lib/json.c b/lib/json.c
index 91f38ad4..2e0c50c1 100644
--- a/lib/json.c
+++ b/lib/json.c
@@ -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;
diff --git a/lib/misc.c b/lib/misc.c
index 6ceb6f3c..02b1814c 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -26,8 +26,8 @@
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
@@ -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/misc.h b/lib/misc.h
index 460cce8c..d8cce32b 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -19,8 +19,8 @@
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
*/
#ifndef _MISC_H
diff --git a/lib/proxy.c b/lib/proxy.c
index 6ada4917..86bb0dcc 100644
--- a/lib/proxy.c
+++ b/lib/proxy.c
@@ -16,7 +16,7 @@
*
* 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
*
*/
diff --git a/lib/proxy.h b/lib/proxy.h
index b3be0a66..b84b37ff 100644
--- a/lib/proxy.h
+++ b/lib/proxy.h
@@ -15,7 +15,7 @@
*
* 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
*
*/
diff --git a/lib/ssl_client.h b/lib/ssl_client.h
index 206fe9cb..d23d21f0 100644
--- a/lib/ssl_client.h
+++ b/lib/ssl_client.h
@@ -19,8 +19,8 @@
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
*/
/* ssl_client makes it easier to open SSL connections to servers. (It
diff --git a/lib/ssl_gnutls.c b/lib/ssl_gnutls.c
index f6bdd6b2..fade7de2 100644
--- a/lib/ssl_gnutls.c
+++ b/lib/ssl_gnutls.c
@@ -19,8 +19,8 @@
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
*/
#include <gnutls/gnutls.h>
@@ -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_nss.c b/lib/ssl_nss.c
index 045cd322..00a574f7 100644
--- a/lib/ssl_nss.c
+++ b/lib/ssl_nss.c
@@ -21,8 +21,8 @@
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
*/
#include "bitlbee.h"
diff --git a/lib/ssl_openssl.c b/lib/ssl_openssl.c
index 3486f044..63937380 100644
--- a/lib/ssl_openssl.c
+++ b/lib/ssl_openssl.c
@@ -19,8 +19,8 @@
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
*/
#include <openssl/crypto.h>
@@ -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 );
diff --git a/lib/url.c b/lib/url.c
index 9e330f8c..1c7ff656 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -19,8 +19,8 @@
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
*/
#include "url.h"
diff --git a/lib/url.h b/lib/url.h
index 55107ad2..d49d3365 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -19,8 +19,8 @@
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
*/
#include "bitlbee.h"