[521] in BarnOwl Developers
[D-O-H] r641 - in trunk: . owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:07:03 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Fri, 2 Mar 2007 09:29:07 -0500 (EST)
Author: nelhage
Date: 2007-03-02 09:29:07 -0500 (Fri, 02 Mar 2007)
New Revision: 641
Modified:
trunk/
trunk/owl/logging.c
Log:
r19193@phanatique: nelhage | 2007-03-02 09:28:24 -0500
Use owl_message_get_zsig instead of owl_message_get_notice.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19191
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19193
Modified: trunk/owl/logging.c
===================================================================
--- trunk/owl/logging.c 2007-03-02 14:22:27 UTC (rev 640)
+++ trunk/owl/logging.c 2007-03-02 14:29:07 UTC (rev 641)
@@ -332,7 +332,7 @@
{
FILE *file, *allfile;
char filename[MAXPATHLEN], allfilename[MAXPATHLEN], *logpath;
- char *frombuff=NULL, *from=NULL, *buff=NULL, *ptr;
+ char *frombuff=NULL, *from=NULL, *zsig=NULL;
int len, ch, i, personal;
/* figure out if it's a "personal" message or not */
@@ -440,11 +440,8 @@
if (strcmp(owl_message_get_opcode(m), "")) fprintf(file, " Opcode: %s", owl_message_get_opcode(m));
fprintf(file, "\n");
fprintf(file, "Time: %s Host: %s\n", owl_message_get_timestr(m), owl_message_get_hostname(m));
- ptr=owl_zephyr_get_zsig(owl_message_get_notice(m), &i);
- buff=owl_malloc(i+10);
- memcpy(buff, ptr, i);
- buff[i]='\0';
- fprintf(file, "From: %s <%s>\n\n", buff, tmp);
+ zsig=owl_message_get_zsig(m);
+ fprintf(file, "From: %s <%s>\n\n", zsig, tmp);
fprintf(file, "%s\n\n", owl_message_get_body(m));
owl_free(tmp);
} else if (owl_message_is_type_aim(m) && !owl_message_is_loginout(m)) {
@@ -479,7 +476,7 @@
if (strcmp(owl_message_get_opcode(m), "")) fprintf(allfile, " Opcode: %s", owl_message_get_opcode(m));
fprintf(allfile, "\n");
fprintf(allfile, "Time: %s Host: %s\n", owl_message_get_timestr(m), owl_message_get_hostname(m));
- fprintf(allfile, "From: %s <%s>\n\n", buff, tmp);
+ fprintf(allfile, "From: %s <%s>\n\n", zsig, tmp);
fprintf(allfile, "%s\n\n", owl_message_get_body(m));
owl_free(tmp);
} else if (owl_message_is_type_aim(m) && !owl_message_is_loginout(m)) {
@@ -499,8 +496,5 @@
fclose(allfile);
}
- if (owl_message_is_type_zephyr(m)) {
- owl_free(buff);
- }
owl_free(frombuff);
}
