Changeset 6829afc for zcrypt.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:

• zcrypt.c (modified) (7 diffs)

zcrypt.c

@@ -27 +27 @@
 #include "filterproc.h"
 
+/* 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 MAX_KEY      128
 #define MAX_LINE     128
@@ -53 +57 @@
 } ZWRITEOPTIONS;
 
-G_GNUC_WARN_UNUSED_RESULT char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance);
+CALLER_OWN char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance);
 int ParseCryptSpec(const char *spec, const char **keyfile);
-G_GNUC_WARN_UNUSED_RESULT char *BuildArgString(char **argv, int start, int end);
-G_GNUC_WARN_UNUSED_RESULT char *read_keystring(const char *keyfile);
+CALLER_OWN char *BuildArgString(char **argv, int start, int end);
+CALLER_OWN char *read_keystring(const char *keyfile);
 
 int do_encrypt(int zephyr, const char *class, const char *instance,
@@ -364 +368 @@
 /* Build a space-separated string from argv from elements between start  *
  * and end - 1.  malloc()'s the returned string. */
-G_GNUC_WARN_UNUSED_RESULT char *BuildArgString(char **argv, int start, int end)
+CALLER_OWN char *BuildArgString(char **argv, int start, int end)
 {
   int len = 1;
@@ -401 +405 @@
 #define MAX_SEARCH 3
 /* Find the class/instance in the .crypt-table */
-G_GNUC_WARN_UNUSED_RESULT char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance)
+CALLER_OWN char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance)
 {
   char *keyfile = NULL;
@@ -579 +583 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *slurp_stdin(int ignoredot, int *length) {
+CALLER_OWN char *slurp_stdin(int ignoredot, int *length) {
   char *buf;
   char *inptr;
@@ -611 +615 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *GetInputBuffer(ZWRITEOPTIONS *zoptions, int *length) {
+CALLER_OWN char *GetInputBuffer(ZWRITEOPTIONS *zoptions, int *length) {
   char *buf;
 
@@ -637 +641 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *read_keystring(const char *keyfile) {
+CALLER_OWN char *read_keystring(const char *keyfile) {
   char *keystring;
   FILE *fkey = fopen(keyfile, "r");