Changeset 6829afc for zephyr.c

Timestamp:

Jun 25, 2011, 3:26:15 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

12294d2

Parents:

95b52d1

git-author:

David Benjamin <davidben@mit.edu> (06/24/11 22:56:15)

git-committer:

David Benjamin <davidben@mit.edu> (06/25/11 03:26:15)

Message:

Define CALLER_OWN macro

Replace our exising uses of G_GNUC_WARN_UNUSED_RESULT with it. The
old macro is just way too long. This also more clearly specifies the
intent.

File:

• zephyr.c (modified) (10 diffs)

zephyr.c

@@ -524 +524 @@
  */
 #ifdef HAVE_LIBZEPHYR
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_get_field(const ZNotice_t *n, int j)
+CALLER_OWN char *owl_zephyr_get_field(const ZNotice_t *n, int j)
 {
   int i, count, save;
@@ -552 +552 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_get_field_as_utf8(const ZNotice_t *n, int j)
+CALLER_OWN char *owl_zephyr_get_field_as_utf8(const ZNotice_t *n, int j)
 {
   int i, count, save;
@@ -584 +584 @@
 }
 #else
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_get_field(void *n, int j)
+CALLER_OWN char *owl_zephyr_get_field(void *n, int j)
 {
   return(g_strdup(""));
 }
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_get_field_as_utf8(void *n, int j)
+CALLER_OWN char *owl_zephyr_get_field_as_utf8(void *n, int j)
 {
   return owl_zephyr_get_field(n, j);
@@ -621 +621 @@
  * caller must free the return
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_get_message(const ZNotice_t *n, const owl_message *m)
+CALLER_OWN char *owl_zephyr_get_message(const ZNotice_t *n, const owl_message *m)
 {
 #define OWL_NFIELDS     5
@@ -942 +942 @@
 #endif
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_zlocate(const char *user, int auth)
+CALLER_OWN char *owl_zephyr_zlocate(const char *user, int auth)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -1042 +1042 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_makesubline(const char *class, const char *inst, const char *recip)
+CALLER_OWN char *owl_zephyr_makesubline(const char *class, const char *inst, const char *recip)
 {
   return g_strdup_printf("%s,%s,%s\n", class, inst, !strcmp(recip, "") ? "*" : recip);
@@ -1122 +1122 @@
  * free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_getsubs(void)
+CALLER_OWN char *owl_zephyr_getsubs(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -1242 +1242 @@
  * The caller must free the return
  */
-G_GNUC_WARN_UNUSED_RESULT char *short_zuser(const char *in)
+CALLER_OWN char *short_zuser(const char *in)
 {
   char *ptr = strrchr(in, '@');
@@ -1254 +1254 @@
  * The caller must free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *long_zuser(const char *in)
+CALLER_OWN char *long_zuser(const char *in)
 {
   char *ptr = strrchr(in, '@');
@@ -1282 +1282 @@
  * caller must free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_smartstripped_user(const char *in)
+CALLER_OWN char *owl_zephyr_smartstripped_user(const char *in)
 {
   char *slash, *dot, *realm, *out;