comparison libpurple/util.c @ 25218:bdd00a7113d7

propagate from branch 'im.pidgin.pidgin' (head f3891f3348abfe90fbe60a054833c12075aa8df4) to branch 'im.pidgin.cpw.malu.xmpp.attention' (head d235bb23dbe13535f85e071d6c4f42e07ac6e0ce)
author Marcus Lundblad <ml@update.uu.se>
date Sun, 16 Nov 2008 15:39:46 +0000
parents f9503aa61fb4
children 104f6f755c7e b5385e13e32e
comparison
equal deleted inserted replaced
25217:2f01775c81d5 25218:bdd00a7113d7
981 const gchar *css_str = style; 981 const gchar *css_str = style;
982 const gchar *css_value_start; 982 const gchar *css_value_start;
983 const gchar *css_value_end; 983 const gchar *css_value_end;
984 gchar *tmp; 984 gchar *tmp;
985 gchar *ret; 985 gchar *ret;
986
987 g_return_val_if_fail(opt != NULL, NULL);
986 988
987 if (!css_str) 989 if (!css_str)
988 return NULL; 990 return NULL;
989 991
990 /* find the CSS property */ 992 /* find the CSS property */
2388 guint z = 0; 2390 guint z = 0;
2389 gboolean appended = FALSE; 2391 gboolean appended = FALSE;
2390 gunichar c; 2392 gunichar c;
2391 char *tag; 2393 char *tag;
2392 2394
2395 g_return_val_if_fail(str != NULL, NULL);
2393 g_return_val_if_fail(x <= y, NULL); 2396 g_return_val_if_fail(x <= y, NULL);
2394 2397
2395 if (x == y) 2398 if (x == y)
2396 return g_strdup(""); 2399 return g_strdup("");
2397 2400
3438 char proto[11]; 3441 char proto[11];
3439 const char *tmp, *param_string; 3442 const char *tmp, *param_string;
3440 char *cmd; 3443 char *cmd;
3441 GHashTable *params = NULL; 3444 GHashTable *params = NULL;
3442 int len; 3445 int len;
3446
3447 g_return_if_fail(uri != NULL);
3448
3443 if (!(tmp = strchr(uri, ':')) || tmp == uri) { 3449 if (!(tmp = strchr(uri, ':')) || tmp == uri) {
3444 purple_debug_error("util", "Malformed protocol handler message - missing protocol.\n"); 3450 purple_debug_error("util", "Malformed protocol handler message - missing protocol.\n");
3445 return; 3451 return;
3446 } 3452 }
3447 3453
4143 purple_email_is_valid(const char *address) 4149 purple_email_is_valid(const char *address)
4144 { 4150 {
4145 const char *c, *domain; 4151 const char *c, *domain;
4146 static char *rfc822_specials = "()<>@,;:\\\"[]"; 4152 static char *rfc822_specials = "()<>@,;:\\\"[]";
4147 4153
4154 g_return_val_if_fail(address != NULL, FALSE);
4155
4148 /* first we validate the name portion (name@domain) (rfc822)*/ 4156 /* first we validate the name portion (name@domain) (rfc822)*/
4149 for (c = address; *c; c++) { 4157 for (c = address; *c; c++) {
4150 if (*c == '\"' && (c == address || *(c - 1) == '.' || *(c - 1) == '\"')) { 4158 if (*c == '\"' && (c == address || *(c - 1) == '.' || *(c - 1) == '\"')) {
4151 while (*++c) { 4159 while (*++c) {
4152 if (*c == '\\') { 4160 if (*c == '\\') {
4191 gboolean 4199 gboolean
4192 purple_ip_address_is_valid(const char *ip) 4200 purple_ip_address_is_valid(const char *ip)
4193 { 4201 {
4194 int c, o1, o2, o3, o4; 4202 int c, o1, o2, o3, o4;
4195 char end; 4203 char end;
4204
4205 g_return_val_if_fail(ip != NULL, FALSE);
4206
4196 c = sscanf(ip, "%d.%d.%d.%d%c", &o1, &o2, &o3, &o4, &end); 4207 c = sscanf(ip, "%d.%d.%d.%d%c", &o1, &o2, &o3, &o4, &end);
4197 if (c != 4 || o1 < 0 || o1 > 255 || o2 < 0 || o2 > 255 || o3 < 0 || o3 > 255 || o4 < 0 || o4 > 255) 4208 if (c != 4 || o1 < 0 || o1 > 255 || o2 < 0 || o2 > 255 || o3 < 0 || o3 > 255 || o4 < 0 || o4 > 255)
4198 return FALSE; 4209 return FALSE;
4199 return TRUE; 4210 return TRUE;
4200 } 4211 }