Changeset d8e2f07 for owl.h

Timestamp:

Jun 25, 2011, 4:11:19 AM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

95b52d1 (diff), 2560529 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2560529186e398f85a038e8683d29058857eb7b7 into 95b52d17a566adefc77f07749218fe0cb33a66b2

File:

• owl.h (modified) (11 diffs)

owl.h

@@ -199 +199 @@
 #define OWL_ENABLE_ZCRYPT 1
 #endif
+
+/* Annotate functions in which the caller owns the return value and is
+ * responsible for ensuring it is freed. */
+#define CALLER_OWN G_GNUC_WARN_UNUSED_RESULT
 
 #define OWL_META(key) ((key)|010000)
@@ -251 +255 @@
                                  * WARNING:  this approach is hard to make
                                  * thread-safe... */
-  char G_GNUC_WARN_UNUSED_RESULT *(*get_tostring_fn)(const struct _owl_variable *v, const void *val);
+  CALLER_OWN char *(*get_tostring_fn)(const struct _owl_variable *v, const void *val);
                                 /* converts val to a string;
                                  * caller must free the result */
@@ -266 +270 @@
   GString *buff;
 } owl_fmtext;
-
-typedef struct _owl_list {
-  int size;
-  int avail;
-  void **list;
-} owl_list;
 
 typedef struct _owl_dict_el {
@@ -313 +311 @@
   
   /* These don't take any context */
-  char G_GNUC_WARN_UNUSED_RESULT *(*cmd_args_fn)(int argc, const char *const *argv, const char *buff);
+  CALLER_OWN char *(*cmd_args_fn)(int argc, const char *const *argv, const char *buff);
                                 /* takes argv and the full command as buff.
                                  * caller must free return value if !NULL */
@@ -320 +318 @@
 
   /* The following also take the active context if it's valid */
-  char G_GNUC_WARN_UNUSED_RESULT *(*cmd_ctxargs_fn)(void *ctx, int argc, const char *const *argv, const char *buff);
+  CALLER_OWN char *(*cmd_ctxargs_fn)(void *ctx, int argc, const char *const *argv, const char *buff);
                                 /* takes argv and the full command as buff.
                                  * caller must free return value if !NULL */
@@ -338 +336 @@
   char *zsig;
   char *message;
-  owl_list recips;
+  GPtrArray *recips;
   int cc;
   int noping;
@@ -359 +357 @@
   int delete;
   const char *hostname;
-  owl_list attributes;            /* this is a list of pairs */
+  GPtrArray *attributes;          /* this is a list of pairs */
   char *timestr;
   time_t time;
@@ -418 +416 @@
 
 typedef struct _owl_messagelist {
-  owl_list list;
+  GPtrArray *list;
 } owl_messagelist;
 
@@ -481 +479 @@
   char     *name;               /* name of keymap */
   char     *desc;               /* description */
-  owl_list  bindings;           /* key bindings */
+  GPtrArray *bindings;          /* key bindings */
   const struct _owl_keymap *parent;     /* parent */
   void (*default_fn)(owl_input j);      /* default action (takes a keypress) */
@@ -504 +502 @@
 
 typedef struct _owl_buddylist {
-  owl_list buddies;
+  GPtrArray *buddies;
 } owl_buddylist;
 
 typedef struct _owl_zbuddylist {
-  owl_list zusers;
+  GPtrArray *zusers;
 } owl_zbuddylist;
 
 typedef struct _owl_errqueue {
-  owl_list errlist;
+  GPtrArray *errlist;
 } owl_errqueue;
 
@@ -538 +536 @@
   owl_dict filters;
   GList *filterlist;
-  owl_list puntlist;
+  GPtrArray *puntlist;
   owl_vardict vars;
   owl_cmddict cmds;