Changeset b0e6560 for zcrypt.c

Timestamp:

Jun 19, 2011, 4:40:05 AM (13 years ago)

Author:

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

Parents:

9d43dcc (diff), 7dfe886 (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 7dfe886e75427ed8ba1ce9cc7e170bf1abd16b2c into 9d43dcc114c45fb1d94dec67eb38456bded0dc0d

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");