- Timestamp:
- Feb 11, 2011, 4:31:46 PM (13 years ago)
- Branches:
- master, release-1.10, release-1.8, release-1.9
- Children:
- 3472845
- Parents:
- ddbbcffa
- git-author:
- Anders Kaseorg <andersk@mit.edu> (08/27/09 00:55:10)
- git-committer:
- Anders Kaseorg <andersk@mit.edu> (02/11/11 16:31:46)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
zephyr.c
rddbbcffa rd4927a7 23 23 { 24 24 if (input != NULL) 25 return owl_strdup(input);25 return g_strdup(input); 26 26 else 27 27 return owl_sprintf("%s/%s", owl_global_get_homedir(&g), name); … … 292 292 if ((tmp = strtok(start, ",\n\r")) == NULL) 293 293 continue; 294 subs[count].zsub_class = owl_strdup(tmp);294 subs[count].zsub_class = g_strdup(tmp); 295 295 if ((tmp=strtok(NULL, ",\n\r")) == NULL) 296 296 continue; 297 subs[count].zsub_classinst = owl_strdup(tmp);297 subs[count].zsub_classinst = g_strdup(tmp); 298 298 if ((tmp = strtok(NULL, " \t\n\r")) == NULL) 299 299 continue; 300 subs[count].zsub_recipient = owl_strdup(tmp);300 subs[count].zsub_recipient = g_strdup(tmp); 301 301 302 302 /* if it started with '-' then add it to the global punt list, and … … 337 337 count=0; 338 338 339 subs[count].zsub_class= owl_strdup("message");340 subs[count].zsub_classinst= owl_strdup("*");341 subs[count].zsub_recipient= owl_strdup("%me%");339 subs[count].zsub_class=g_strdup("message"); 340 subs[count].zsub_classinst=g_strdup("*"); 341 subs[count].zsub_recipient=g_strdup("%me%"); 342 342 count++; 343 343 … … 400 400 } 401 401 402 subs[count].zsub_class = owl_strdup("login");403 subs[count].zsub_recipient = owl_strdup("*");402 subs[count].zsub_class = g_strdup("login"); 403 subs[count].zsub_recipient = g_strdup("*"); 404 404 subs[count].zsub_classinst = long_zuser(buffer); 405 405 … … 483 483 /* If there's no message here, just run along now */ 484 484 if (n->z_message_len == 0) 485 return( owl_strdup(""));485 return(g_strdup("")); 486 486 487 487 count=save=0; … … 491 491 if (count==j) { 492 492 /* just found the end of the field we're looking for */ 493 return( owl_strdup(n->z_message+save));493 return(g_strdup(n->z_message+save)); 494 494 } else { 495 495 save=i+1; … … 502 502 } 503 503 504 return( owl_strdup(""));504 return(g_strdup("")); 505 505 } 506 506 … … 511 511 /* If there's no message here, just run along now */ 512 512 if (n->z_message_len == 0) 513 return( owl_strdup(""));513 return(g_strdup("")); 514 514 515 515 count=save=0; … … 534 534 } 535 535 536 return( owl_strdup(""));536 return(g_strdup("")); 537 537 } 538 538 #else 539 539 char *owl_zephyr_get_field(void *n, int j) 540 540 { 541 return( owl_strdup(""));541 return(g_strdup("")); 542 542 } 543 543 char *owl_zephyr_get_field_as_utf8(void *n, int j) … … 578 578 /* don't let ping messages have a body */ 579 579 if (!strcasecmp(n->z_opcode, "ping")) { 580 return( owl_strdup(""));580 return(g_strdup("")); 581 581 } 582 582 … … 804 804 805 805 memset(&zw, 0, sizeof(zw)); 806 zw.class = owl_strdup(retnotice->z_class);807 zw.inst = owl_strdup(retnotice->z_class_inst);806 zw.class = g_strdup(retnotice->z_class); 807 zw.inst = g_strdup(retnotice->z_class_inst); 808 808 realm = strchr(retnotice->z_recipient, '@'); 809 809 if(realm) { 810 zw.realm = owl_strdup(realm + 1);810 zw.realm = g_strdup(realm + 1); 811 811 } else { 812 zw.realm = owl_strdup(owl_zephyr_get_realm());812 zw.realm = g_strdup(owl_zephyr_get_realm()); 813 813 } 814 zw.opcode = owl_strdup(retnotice->z_opcode);815 zw.zsig = owl_strdup("");814 zw.opcode = g_strdup(retnotice->z_opcode); 815 zw.zsig = g_strdup(""); 816 816 owl_list_create(&(zw.recips)); 817 owl_list_append_element(&(zw.recips), owl_strdup(tmp));817 owl_list_append_element(&(zw.recips), g_strdup(tmp)); 818 818 819 819 owl_log_outgoing_zephyr_error(&zw, buff); … … 870 870 to=owl_zephyr_smartstripped_user(owl_message_get_sender(m)); 871 871 } else { 872 to= owl_strdup(owl_message_get_sender(m));872 to=g_strdup(owl_message_get_sender(m)); 873 873 } 874 874 … … 934 934 result = owl_sprintf("%s: Hidden or not logged in\n", myuser); 935 935 } else { 936 result = owl_strdup("");936 result = g_strdup(""); 937 937 for (; numlocs; numlocs--) { 938 938 ZGetLocations(&locations, &one); … … 950 950 return result; 951 951 #else 952 return owl_strdup("");952 return g_strdup(""); 953 953 #endif 954 954 } … … 1132 1132 ret=ZRetrieveSubscriptions(0, &num); 1133 1133 if (ret==ZERR_TOOMANYSUBS) { 1134 return( owl_strdup("Zephyr: too many subscriptions\n"));1134 return(g_strdup("Zephyr: too many subscriptions\n")); 1135 1135 } else if (ret || (num <= 0)) { 1136 return( owl_strdup("Zephyr: error retriving subscriptions\n"));1136 return(g_strdup("Zephyr: error retriving subscriptions\n")); 1137 1137 } 1138 1138 … … 1143 1143 ZFlushSubscriptions(); 1144 1144 g_string_free(buf, true); 1145 return owl_strdup("Error while getting subscriptions\n");1145 return g_strdup("Error while getting subscriptions\n"); 1146 1146 } else { 1147 1147 /* g_string_append_printf would be backwards. */ … … 1158 1158 return g_string_free(buf, false); 1159 1159 #else 1160 return( owl_strdup("Zephyr not available"));1160 return(g_strdup("Zephyr not available")); 1161 1161 #endif 1162 1162 } … … 1185 1185 char *out, *ptr; 1186 1186 1187 out= owl_strdup(in);1187 out=g_strdup(in); 1188 1188 ptr=strchr(out, '@'); 1189 1189 if (ptr) { … … 1201 1201 { 1202 1202 if (strchr(in, '@')) { 1203 return( owl_strdup(in));1203 return(g_strdup(in)); 1204 1204 } 1205 1205 return(owl_sprintf("%s@%s", in, owl_zephyr_get_realm())); … … 1215 1215 char *slash, *dot, *realm, *out; 1216 1216 1217 out = owl_strdup(in);1217 out = g_strdup(in); 1218 1218 1219 1219 /* bail immeaditly if we don't have to do any work */
Note: See TracChangeset
for help on using the changeset viewer.