internal: Introduce VIR_RETURN_PTR

With the introduction of more and more internal data types which support
VIR_AUTOPTR it's becoming common to see the following pattern:

  VIR_AUTOPTR(virSomething) some = NULL
  virSomethingPtr ret = NULL;

  ... (ret is not touched ) ...

  VIR_STEAL_PTR(ret, some);
  return ret;

This patch introduces a macro named VIR_RETURN_PTR which returns the
pointer directly without the need for an explicitly defined return
variable and use of VIR_STEAL_PTR. Internally obviously a temporary
pointer is created to allow setting the original pointer to NULL so that
the VIR_AUTOPTR function does not free the memory which we want to
actually return.

The name of the temporary variable is deliberately long and complex to
minimize the possibility of collision.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/internal.h b/src/internal.h
index cf03a821054560f640257d11246efb4c292b6857..5a868bb00c8e525c9eb1cc8a3ea6133043674e41 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -279,6 +279,21 @@
         (b) = NULL; \
     } while (0)
 
+/**
+ * VIR_RETURN_PTR:
+ * @ret: pointer to return
+ *
+ * Returns value of @ret while clearing @ret. This ensures that pointers
+ * freed by using VIR_AUTOPTR can be easily passed back to the caller without
+ * any temporary variable. @ptr is evaluated more than once.
+ */
+# define VIR_RETURN_PTR(ptr) \
+    do { \
+        typeof(ptr) virTemporaryReturnPointer = (ptr); \
+        (ptr) = NULL; \
+        return virTemporaryReturnPointer; \
+    } while (0)
+
 /**
  * virCheckFlags:
  * @supported: an OR'ed set of supported flags