Changes in zcrypt.c [d427f08:6829afc]
Legend:
- Unmodified
- Added
- Removed
-
zcrypt.c
rd427f08 r6829afc 27 27 #include "filterproc.h" 28 28 29 /* Annotate functions in which the caller owns the return value and is 30 * responsible for ensuring it is freed. */ 31 #define CALLER_OWN G_GNUC_WARN_UNUSED_RESULT 32 29 33 #define MAX_KEY 128 30 34 #define MAX_LINE 128 … … 53 57 } ZWRITEOPTIONS; 54 58 55 G_GNUC_WARN_UNUSED_RESULTchar *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance);59 CALLER_OWN char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance); 56 60 int ParseCryptSpec(const char *spec, const char **keyfile); 57 G_GNUC_WARN_UNUSED_RESULTchar *BuildArgString(char **argv, int start, int end);58 G_GNUC_WARN_UNUSED_RESULTchar *read_keystring(const char *keyfile);61 CALLER_OWN char *BuildArgString(char **argv, int start, int end); 62 CALLER_OWN char *read_keystring(const char *keyfile); 59 63 60 64 int do_encrypt(int zephyr, const char *class, const char *instance, … … 364 368 /* Build a space-separated string from argv from elements between start * 365 369 * and end - 1. malloc()'s the returned string. */ 366 G_GNUC_WARN_UNUSED_RESULTchar *BuildArgString(char **argv, int start, int end)370 CALLER_OWN char *BuildArgString(char **argv, int start, int end) 367 371 { 368 372 int len = 1; … … 401 405 #define MAX_SEARCH 3 402 406 /* Find the class/instance in the .crypt-table */ 403 G_GNUC_WARN_UNUSED_RESULTchar *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance)407 CALLER_OWN char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance) 404 408 { 405 409 char *keyfile = NULL; … … 579 583 } 580 584 581 G_GNUC_WARN_UNUSED_RESULTchar *slurp_stdin(int ignoredot, int *length) {585 CALLER_OWN char *slurp_stdin(int ignoredot, int *length) { 582 586 char *buf; 583 587 char *inptr; … … 611 615 } 612 616 613 G_GNUC_WARN_UNUSED_RESULTchar *GetInputBuffer(ZWRITEOPTIONS *zoptions, int *length) {617 CALLER_OWN char *GetInputBuffer(ZWRITEOPTIONS *zoptions, int *length) { 614 618 char *buf; 615 619 … … 637 641 } 638 642 639 G_GNUC_WARN_UNUSED_RESULTchar *read_keystring(const char *keyfile) {643 CALLER_OWN char *read_keystring(const char *keyfile) { 640 644 char *keystring; 641 645 FILE *fkey = fopen(keyfile, "r");
Note: See TracChangeset
for help on using the changeset viewer.