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

• util.c (modified) (14 diffs)

util.c

@@ -35 +35 @@
  * duplicate slashes are removed.  Caller must free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_util_makepath(const char *in)
+CALLER_OWN char *owl_util_makepath(const char *in)
 {
   int i, j, x;
@@ -102 +102 @@
    to -1, argv will be NULL and the caller does not need to free anything. The
    returned vector is NULL-terminated. */
-G_GNUC_WARN_UNUSED_RESULT char **owl_parseline(const char *line, int *argc)
+CALLER_OWN char **owl_parseline(const char *line, int *argc)
 {
   GPtrArray *argv;
@@ -245 +245 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_string_build_quoted(const char *tmpl, ...)
+CALLER_OWN char *owl_string_build_quoted(const char *tmpl, ...)
 {
   GString *buf = g_string_new("");
@@ -257 +257 @@
 /* Returns a quoted version of arg suitable for placing in a
  * command-line. Result should be freed with g_free. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_arg_quote(const char *arg)
+CALLER_OWN char *owl_arg_quote(const char *arg)
 {
   GString *buf = g_string_new("");;
@@ -265 +265 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_util_minutes_to_timestr(int in)
+CALLER_OWN char *owl_util_minutes_to_timestr(int in)
 {
   int days, hours;
@@ -331 +331 @@
 
 /* Get the default tty name.  Caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_util_get_default_tty(void)
+CALLER_OWN char *owl_util_get_default_tty(void)
 {
   const char *tmp;
@@ -353 +353 @@
  * return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_util_stripnewlines(const char *in)
+CALLER_OWN char *owl_util_stripnewlines(const char *in)
 {
   
@@ -384 +384 @@
  * Error conditions are the same as g_file_read_link.
  */
-G_GNUC_WARN_UNUSED_RESULT gchar *owl_util_recursive_resolve_link(const char *filename)
+CALLER_OWN gchar *owl_util_recursive_resolve_link(const char *filename)
 {
   gchar *last_path = g_strdup(filename);
@@ -511 +511 @@
    The caller is responsible for freeing the allocated string.
 */
-G_GNUC_WARN_UNUSED_RESULT char *owl_util_baseclass(const char *class)
+CALLER_OWN char *owl_util_baseclass(const char *class)
 {
   char *start, *end;
@@ -547 +547 @@
 /* Strips format characters from a valid utf-8 string. Returns the
    empty string if 'in' does not validate.  Caller must free the return. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_strip_format_chars(const char *in)
+CALLER_OWN char *owl_strip_format_chars(const char *in)
 {
   char *r;
@@ -586 +586 @@
  * Caller must free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_validate_or_convert(const char *in)
+CALLER_OWN char *owl_validate_or_convert(const char *in)
 {
   if (g_utf8_validate(in, -1, NULL)) {
@@ -602 +602 @@
  * Caller must free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_validate_utf8(const char *in)
+CALLER_OWN char *owl_validate_utf8(const char *in)
 {
   char *out;
@@ -635 +635 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_escape_highbit(const char *str)
+CALLER_OWN char *owl_escape_highbit(const char *str)
 {
   GString *out = g_string_new("");
@@ -698 +698 @@
 
 /* Read the rest of the input available in fp into a string. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_slurp(FILE *fp)
+CALLER_OWN char *owl_slurp(FILE *fp)
 {
   char *buf = NULL;