Changeset 5b54595 for functions.c

Timestamp:

Mar 11, 2012, 10:53:26 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

release-1.8

Children:

54bf650

Parents:

6a08f16

git-author:

Anders Kaseorg <andersk@mit.edu> (01/19/12 21:32:33)

git-committer:

David Benjamin <davidben@mit.edu> (03/11/12 22:53:26)

Message:

zephyr: Use field iterator interface to avoid quadratic loops

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

[davidben@mit.edu: cherry-picked onto release-1.8
 Conflicts: functions.c ]

File:

• functions.c (modified) (2 diffs)

functions.c

@@ -1432 +1432 @@
       char *tmpbuff;
       int i, fields;
+      const char *f;
 
       n=owl_message_get_notice(m);
@@ -1475 +1476 @@
         owl_fmtext_appendf_normal(&fm, "  Fields    : %i\n", fields);
 
-        for (i = 0; i < fields; i++) {
-          tmpbuff = owl_zephyr_get_field_as_utf8(n, i + 1);
+        for (i = 0, f = owl_zephyr_first_raw_field(n); f != NULL;
+             i++, f = owl_zephyr_next_raw_field(n, f)) {
+          tmpbuff = owl_zephyr_field_as_utf8(n, f);
 
           g_strdelimit(tmpbuff, "\n", '~');