[854] in BarnOwl Developers
[D-O-H] r843 - branches/barnowl_sqlite/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:10:25 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, 11 Jan 2008 23:03:31 -0500 (EST)
Author: nelhage
Date: 2008-01-11 23:03:31 -0500 (Fri, 11 Jan 2008)
New Revision: 843
Modified:
branches/barnowl_sqlite/owl/functions.c
branches/barnowl_sqlite/owl/message.c
Log:
Don't export owl_message_get_notice
Modified: branches/barnowl_sqlite/owl/functions.c
===================================================================
--- branches/barnowl_sqlite/owl/functions.c 2008-01-12 03:50:21 UTC (rev 842)
+++ branches/barnowl_sqlite/owl/functions.c 2008-01-12 04:03:31 UTC (rev 843)
@@ -1552,7 +1552,8 @@
if (owl_message_is_direction_in(m)) {
char *ptr, tmpbuff[1024];
int i, j, fields, len;
-
+ /* XXX TODO Display this information again*/
+ /*
n=owl_message_get_notice(m);
if (!owl_message_is_pseudo(m)) {
@@ -1579,11 +1580,13 @@
owl_fmtext_append_normal(&fm, "ILLEGAL VALUE\n");
}
}
+ */
owl_fmtext_append_normal(&fm, " Host : ");
owl_fmtext_append_normal(&fm, owl_message_get_hostname(m));
if (!owl_message_is_pseudo(m)) {
- owl_fmtext_append_normal(&fm, "\n");
+ owl_fmtext_append_normal(&fm, "\n");
+ /*
sprintf(buff, " Port : %i\n", ntohs(n->z_port));
owl_fmtext_append_normal(&fm, buff);
@@ -1591,21 +1594,20 @@
owl_fmtext_append_normal(&fm, owl_zephyr_get_authstr(n));
owl_fmtext_append_normal(&fm, "\n");
- /* fix this */
sprintf(buff, " Checkd Ath: %i\n", n->z_checked_auth);
sprintf(buff, "%s Multi notc: %s\n", buff, n->z_multinotice);
sprintf(buff, "%s Num other : %i\n", buff, n->z_num_other_fields);
sprintf(buff, "%s Msg Len : %i\n", buff, n->z_message_len);
owl_fmtext_append_normal(&fm, buff);
-
- sprintf(buff, " Fields : %i\n", owl_zephyr_get_num_fields(n));
+ */
+ sprintf(buff, " Fields : %i\n", owl_message_get_num_fields(m));
owl_fmtext_append_normal(&fm, buff);
- fields=owl_zephyr_get_num_fields(n);
+ fields=owl_message_get_num_fields(m);
for (i=0; i<fields; i++) {
sprintf(buff, " Field %i : ", i+1);
- ptr=owl_zephyr_get_field(n, i+1);
+ ptr=owl_message_get_field(m, i+1);
len=strlen(ptr);
if (len<30) {
strncpy(tmpbuff, ptr, len);
@@ -1626,8 +1628,8 @@
strcat(buff, "\n");
owl_fmtext_append_normal(&fm, buff);
}
- owl_fmtext_append_normal(&fm, " Default Fm:");
- owl_fmtext_append_normal(&fm, n->z_default_format);
+ /* owl_fmtext_append_normal(&fm, " Default Fm:");
+ owl_fmtext_append_normal(&fm, n->z_default_format); */
}
}
Modified: branches/barnowl_sqlite/owl/message.c
===================================================================
--- branches/barnowl_sqlite/owl/message.c 2008-01-12 03:50:21 UTC (rev 842)
+++ branches/barnowl_sqlite/owl/message.c 2008-01-12 04:03:31 UTC (rev 843)
@@ -446,12 +446,12 @@
}
#ifdef HAVE_LIBZEPHYR
-ZNotice_t *owl_message_get_notice(owl_message *m)
+ZNotice_t *owl_message_get_notice(owl_message *m) /*noproto*/
{
return(&(m->notice));
}
#else
-void *owl_message_get_notice(owl_message *m)
+void *owl_message_get_notice(owl_message *m) /*noproto*/
{
return(NULL);
}
@@ -834,6 +834,16 @@
}
#endif
}
+
+int owl_message_get_num_fields(owl_message *m)
+{
+ return owl_zephyr_get_num_fields(owl_message_get_notice(m));
+}
+
+char *owl_message_get_field(owl_message *m, int n)
+{
+ return owl_zephyr_get_field(owl_message_get_notice(m), n);
+}
#else
void owl_message_create_from_znotice(owl_message *m, void *n)
{
