Changeset d427f08 for zcrypt.c

Timestamp:

Jun 22, 2011, 3:40:50 PM (12 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.8, release-1.9

Children:

b343c2c

Parents:

84a071f

git-author:

Jason Gross <jgross@mit.edu> (06/06/11 05:24:30)

git-committer:

Nelson Elhage <nelhage@mit.edu> (06/22/11 15:40:50)

Message:

Use G_GNUC_WARN_UNUSED_RESULT

Have gcc warn us when we ignore the result of a function that requires
the caller to free the result, or an initilization function that can
fail.  This might help (slightly) with preventing leaks and segfaults.

Additionally changed some functions that should never fail to not
return values.  (The owl_list_* functions changed only fail if
list->size < 0, which we assume is not the case elsewhere.)

File:

• zcrypt.c (modified) (6 diffs)

zcrypt.c

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