Changeset 1065dd4 for protocols/oscar

Timestamp:

2015-01-17T20:00:49Z (9 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/oscar

Files:

• auth.c (modified) (1 diff)
• oscar.c (modified) (4 diffs)
• oscar_util.c (modified) (1 diff)

protocols/oscar/auth.c

@@ -125 +125 @@
                 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);
 

protocols/oscar/oscar.c

@@ -19 +19 @@
  * 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
  *
  */
@@ -368 +368 @@
 {
         set_t *s;
-        gboolean icq = isdigit(acc->user[0]);
+        gboolean icq = g_ascii_isdigit(acc->user[0]);
         
         if (icq) {
@@ -394 +394 @@
         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
@@ -2500 +2500 @@
         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';
         

protocols/oscar/oscar_util.c

@@ -57 +57 @@
                                 curPtr2++;
                 } else {
-                        if ( toupper(*curPtr1) != toupper(*curPtr2))
+                        if ( g_ascii_toupper(*curPtr1) != g_ascii_toupper(*curPtr2))
                                 return 1;
                         curPtr1++;