X-Git-Url: http://git.efficios.com/?p=argpar.git;a=blobdiff_plain;f=argpar%2Fargpar.h;h=6ebc845e69cec679df268c464dfc8b19a161e166;hp=45dd84ed9d493d0bfb5208bfada2a7ed25750938;hb=fb12ac67619ddd7101bb2db3fd02b9119ee4a203;hpb=fc07e5264804963a3de6d1b929a9eb4fd37e49d4

diff --git a/argpar/argpar.h b/argpar/argpar.h
index 45dd84e..6ebc845 100644
--- a/argpar/argpar.h
+++ b/argpar/argpar.h
@@ -105,16 +105,16 @@
 #define ARGPAR_OPT_DESCR_SENTINEL	{ -1, '\0', NULL, false }
 
 /*
- * ARGPAR_HIDDEN: if argpar is used in some shared library, we don't
- * want them to be exported by that library, so mark them as "hidden".
+ * If argpar is used in some shared library, we don't want said library
+ * to export its symbols, so mark them as "hidden".
  *
  * On Windows, symbols are local unless explicitly exported; see
  * <https://gcc.gnu.org/wiki/Visibility>.
  */
 #if defined(_WIN32) || defined(__CYGWIN__)
-#define ARGPAR_HIDDEN
+# define ARGPAR_HIDDEN
 #else
-#define ARGPAR_HIDDEN __attribute__((visibility("hidden")))
+# define ARGPAR_HIDDEN __attribute__((visibility("hidden")))
 #endif
 
 /* Forward-declaration for the opaque type */
@@ -178,20 +178,19 @@ struct argpar_item_non_opt {
 };
 
 struct argpar_item_array {
-	/* Array of `struct argpar_item *`, or `NULL` on error */
-	struct argpar_item **items;
+	const struct argpar_item **items;
 
-	/* Number of used slots in `items`. */
+	/* Number of used slots in `items` */
 	unsigned int n_items;
 
-	/* Number of allocated slots in `items`. */
+	/* Number of allocated slots in `items` */
 	unsigned int n_alloc;
 };
 
 /* What is returned by argpar_parse() */
 struct argpar_parse_ret {
 	/*
-	 * Array of `struct argpar_item *`, or `NULL` on error.
+	 * Array of parsing items, or `NULL` on error.
 	 *
 	 * Do NOT destroy those items manually with
 	 * argpar_iter_destroy(): call argpar_parse_ret_fini() to
@@ -340,10 +339,10 @@ void argpar_item_destroy(const struct argpar_item *item);
  * Destroys `_item` (`const struct argpar_item *`) and sets it to
  * `NULL`.
  */
-#define ARGPAR_ITEM_DESTROY_AND_RESET(_item)	\
-	{					\
-		argpar_item_destroy(_item);	\
-		_item = NULL;			\
+#define ARGPAR_ITEM_DESTROY_AND_RESET(_item)				\
+	{								\
+		argpar_item_destroy(_item);				\
+		_item = NULL;						\
 	}
 
 #endif /* BABELTRACE_ARGPAR_H */