- jbj: start using poptArg and poptArgType() where useful.

- jbj: poptint.h: add a poptArgType define for bitfield type abstraction.
- jbj: poptint.h: add a poptArg union for opt->arg access without casts.

1 files changed, 14 insertions, 0 deletions

diff --git a/poptint.h b/poptint.h
index 414dd60..2b2d6b6 100644
--- a/poptint.h
+++ b/poptint.h
@@ -42,6 +42,20 @@ typedef struct {
 #define PBM_CLR(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
 #define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
 
+/** \ingroup popt
+ * A union to simplify opt->arg access without casting.
+ */
+typedef union poptArg_u {
+    void * ptr;
+    int * intp;
+    long * longp;
+    const char ** argv;
+    poptCallbackType cb;
+    poptOption opt;
+} poptArg;
+
+#define	poptArgType(opt)	((opt)->argInfo & POPT_ARG_MASK)
+
 struct optionStackEntry {
     int argc;
 /*@only@*/ /*@null@*/