- Timestamp:
- Feb 11, 2011, 4:31:42 PM (14 years ago)
- Branches:
- master, release-1.10, release-1.8, release-1.9
- Children:
- d4927a7
- Parents:
- 35b6eb9
- git-author:
- Anders Kaseorg <andersk@mit.edu> (08/27/09 00:52:41)
- git-committer:
- Anders Kaseorg <andersk@mit.edu> (02/11/11 16:31:42)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
message.c
r96828e4 rddbbcffa 68 68 p=owl_list_get_element(&(m->attributes), i); 69 69 if (owl_pair_get_key(p) == attrname) { 70 owl_free(owl_pair_get_value(p));70 g_free(owl_pair_get_value(p)); 71 71 pair = p; 72 72 break; … … 134 134 } 135 135 owl_fmtext_append_normal(fm, buff); 136 owl_free(buff);136 g_free(buff); 137 137 } 138 138 } … … 611 611 out = g_list_prepend(out, owl_strdup(user)); 612 612 } 613 owl_free(shortuser);613 g_free(shortuser); 614 614 user = strtok(NULL, " "); 615 615 } 616 616 617 owl_free(recip);618 owl_free(cc);617 g_free(recip); 618 g_free(cc); 619 619 620 620 return(out); … … 749 749 /* Collapse any identical entries */ 750 750 while (cc->next && strcasecmp(cc->data, cc->next->data) == 0) { 751 owl_free(cc->data);751 g_free(cc->data); 752 752 cc = g_list_delete_link(cc, cc); 753 753 } … … 756 756 g_string_append(recips, tmp); 757 757 758 owl_free(tmp);759 owl_free(cc->data);758 g_free(tmp); 759 g_free(cc->data); 760 760 cc = g_list_delete_link(cc, cc); 761 761 … … 793 793 794 794 /* save the time, we need to nuke the string saved by message_init */ 795 if (m->timestr) owl_free(m->timestr);795 if (m->timestr) g_free(m->timestr); 796 796 m->time=n->z_time.tv_sec; 797 797 m->timestr=owl_strdup(ctime(&(m->time))); … … 821 821 tmp=owl_zephyr_get_field(n, 1); 822 822 owl_message_set_attribute(m, "loginhost", tmp); 823 owl_free(tmp);823 g_free(tmp); 824 824 825 825 tmp=owl_zephyr_get_field(n, 3); 826 826 owl_message_set_attribute(m, "logintty", tmp); 827 owl_free(tmp);827 g_free(tmp); 828 828 } 829 829 … … 868 868 tmp2=owl_util_stripnewlines(tmp); 869 869 owl_message_set_body(m, tmp2); 870 owl_free(tmp2);870 g_free(tmp2); 871 871 } else { 872 872 owl_message_set_body(m, tmp); 873 873 } 874 owl_free(tmp);874 g_free(tmp); 875 875 876 876 /* if zcrypt is enabled try to decrypt the message */ … … 891 891 892 892 rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status); 893 owl_free(zcrypt);893 g_free(zcrypt); 894 894 895 895 if(!rv && !status) { … … 899 899 } 900 900 owl_message_set_body(m, out); 901 owl_free(out);901 g_free(out); 902 902 } else if(out) { 903 owl_free(out);903 g_free(out); 904 904 } 905 905 } … … 957 957 owl_function_debugmsg("create_pseudo_login: host is %s", host ? host : ""); 958 958 owl_message_set_hostname(m, host ? host : ""); 959 owl_free(longuser);959 g_free(longuser); 960 960 } 961 961 … … 978 978 owl_message_set_recipient(m, 979 979 longzuser); /* only gets the first user, must fix */ 980 owl_free(longzuser);980 g_free(longzuser); 981 981 } 982 982 owl_message_set_opcode(m, owl_zwrite_get_opcode(z)); … … 987 987 replyline = owl_zwrite_get_replyline(z); 988 988 owl_message_set_zwriteline(m, replyline); 989 owl_free(replyline);989 g_free(replyline); 990 990 991 991 owl_message_set_body(m, body); … … 1018 1018 } 1019 1019 #endif 1020 if (m->timestr) owl_free(m->timestr);1020 if (m->timestr) g_free(m->timestr); 1021 1021 1022 1022 /* free all the attributes */ … … 1024 1024 for (i=0; i<j; i++) { 1025 1025 p=owl_list_get_element(&(m->attributes), i); 1026 owl_free(owl_pair_get_value(p));1027 owl_free(p);1026 g_free(owl_pair_get_value(p)); 1027 g_free(p); 1028 1028 } 1029 1029 … … 1036 1036 { 1037 1037 owl_message_cleanup(m); 1038 owl_free(m);1039 } 1038 g_free(m); 1039 }
Note: See TracChangeset
for help on using the changeset viewer.