popt.h   popt.h 
skipping to change at line 40 skipping to change at line 40
for this table and any for this table and any
included tables; arg points included tables; arg points
to the domain string */ to the domain string */
#define POPT_ARG_VAL 7U /*!< arg should take value val */ #define POPT_ARG_VAL 7U /*!< arg should take value val */
#define POPT_ARG_FLOAT 8U /*!< arg ==> float */ #define POPT_ARG_FLOAT 8U /*!< arg ==> float */
#define POPT_ARG_DOUBLE 9U /*!< arg ==> double */ #define POPT_ARG_DOUBLE 9U /*!< arg ==> double */
#define POPT_ARG_LONGLONG 10U /*!< arg ==> long long */ #define POPT_ARG_LONGLONG 10U /*!< arg ==> long long */
#define POPT_ARG_MAINCALL 16U+11U /*!< EXPERIMENTAL: return (*arg) (ar gc, argv) */ #define POPT_ARG_MAINCALL 16U+11U /*!< EXPERIMENTAL: return (*arg) (ar gc, argv) */
#define POPT_ARG_ARGV 12U /*!< dupe'd arg appended to realloc'd argv array. */ #define POPT_ARG_ARGV 12U /*!< dupe'd arg appended to realloc'd argv array. */
#define POPT_ARG_SHORT 13U /*!< arg ==> short */
#define POPT_ARG_BITSET 16U+14U /*!< arg ==> bit set */
#define POPT_ARG_MASK 0x000000FFU #define POPT_ARG_MASK 0x000000FFU
#define POPT_GROUP_MASK 0x0000FF00U #define POPT_GROUP_MASK 0x0000FF00U
/*@}*/ /*@}*/
/** \ingroup popt /** \ingroup popt
* \name Arg modifiers * \name Arg modifiers
*/ */
/*@{*/ /*@{*/
skipping to change at line 608 skipping to change at line 610
/*@-fcnuse@*/ /*@-fcnuse@*/
int poptStrippedArgv(poptContext con, int argc, char ** argv) int poptStrippedArgv(poptContext con, int argc, char ** argv)
/*@modifies *argv @*/; /*@modifies *argv @*/;
/*@=fcnuse@*/ /*@=fcnuse@*/
/** /**
* Add a string to an argv array. * Add a string to an argv array.
* @retval *argvp argv array * @retval *argvp argv array
* @param argInfo (unused) * @param argInfo (unused)
* @param val string arg to add (using strdup) * @param val string arg to add (using strdup)
* @return 0 always * @return 0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERA TION
*/ */
/*@unused@*/ /*@unused@*/
int poptSaveString(/*@null@*/ const char *** argvp, unsigned int argInfo, int poptSaveString(/*@null@*/ const char *** argvp, unsigned int argInfo,
const char * val) /*@null@*/const char * val)
/*@modifies *argvp @*/; /*@modifies *argvp @*/;
/** /**
* Save a long long, performing logical operation with value. * Save a long long, performing logical operation with value.
* @warning Alignment check may be too strict on certain platorms. * @warning Alignment check may be too strict on certain platorms.
* @param arg integer pointer, aligned on int boundary. * @param arg integer pointer, aligned on int boundary.
* @param argInfo logical operation (see POPT_ARGFLAG_*) * @param argInfo logical operation (see POPT_ARGFLAG_*)
* @param aLongLong value to use * @param aLongLong value to use
* @return 0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERA TION * @return 0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERA TION
*/ */
skipping to change at line 649 skipping to change at line 651
*/ */
/*@-incondefs@*/ /*@-incondefs@*/
/*@unused@*/ /*@unused@*/
int poptSaveLong(/*@null@*/ long * arg, unsigned int argInfo, long aLong) int poptSaveLong(/*@null@*/ long * arg, unsigned int argInfo, long aLong)
/*@globals internalState @*/ /*@globals internalState @*/
/*@modifies *arg, internalState @*/ /*@modifies *arg, internalState @*/
/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/; /*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
/*@=incondefs@*/ /*@=incondefs@*/
/** /**
* Save a short integer, performing logical operation with value.
* @warning Alignment check may be too strict on certain platorms.
* @param arg short pointer, aligned on short boundary.
* @param argInfo logical operation (see POPT_ARGFLAG_*)
* @param aLong value to use
* @return 0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERA
TION
*/
/*@-incondefs@*/
/*@unused@*/
int poptSaveShort(/*@null@*/ short * arg, unsigned int argInfo, long aLong)
/*@globals internalState @*/
/*@modifies *arg, internalState @*/
/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
/*@=incondefs@*/
/**
* Save an integer, performing logical operation with value. * Save an integer, performing logical operation with value.
* @warning Alignment check may be too strict on certain platorms. * @warning Alignment check may be too strict on certain platorms.
* @param arg integer pointer, aligned on int boundary. * @param arg integer pointer, aligned on int boundary.
* @param argInfo logical operation (see POPT_ARGFLAG_*) * @param argInfo logical operation (see POPT_ARGFLAG_*)
* @param aLong value to use * @param aLong value to use
* @return 0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERA TION * @return 0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERA TION
*/ */
/*@-incondefs@*/ /*@-incondefs@*/
/*@unused@*/ /*@unused@*/
int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong) int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
/*@globals internalState @*/ /*@globals internalState @*/
/*@modifies *arg, internalState @*/ /*@modifies *arg, internalState @*/
/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/; /*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
/*@=incondefs@*/ /*@=incondefs@*/
/* The bit set typedef. */
/*@-exporttype@*/
typedef struct poptBits_s {
unsigned int bits[1];
} * poptBits;
/*@=exporttype@*/
#define _POPT_BITS_N 1024U /* estimated population */
#define _POPT_BITS_M ((3U * _POPT_BITS_N) / 2U)
#define _POPT_BITS_K 16U /* no. of linear hash combinations */
/*@-exportlocal -exportvar -globuse @*/
/*@unchecked@*/
extern unsigned int _poptBitsN;
/*@unchecked@*/
extern unsigned int _poptBitsM;
/*@unchecked@*/
extern unsigned int _poptBitsK;
/*@=exportlocal =exportvar =globuse @*/
/*@-exportlocal@*/
int poptBitsAdd(/*@null@*/poptBits bits, /*@null@*/const char * s)
/*@modifies bits @*/;
/*@=exportlocal@*/
int poptBitsChk(/*@null@*/poptBits bits, /*@null@*/const char * s)
/*@*/;
int poptBitsClr(/*@null@*/poptBits bits)
/*@modifies bits @*/;
/*@-exportlocal@*/
int poptBitsDel(/*@null@*/poptBits bits, /*@null@*/const char * s)
/*@modifies bits @*/;
/*@-fcnuse@*/
int poptBitsIntersect(/*@null@*/ poptBits * ap, /*@null@*/ const poptBits b
)
/*@modifies *ap @*/;
int poptBitsUnion(/*@null@*/ poptBits * ap, /*@null@*/ const poptBits b)
/*@modifies *ap @*/;
int poptBitsArgs(/*@null@*/ poptContext con, /*@null@*/ poptBits * ap)
/*@modifies con, *ap @*/;
/*@=fcnuse@*/
/*@=exportlocal@*/
/**
* Save a string into a bit set (experimental).
* @retval *bits bit set (lazily malloc'd if NULL)
* @param argInfo logical operation (see POPT_ARGFLAG_*)
* @param s string to add to bit set
* @return 0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERA
TION
*/
/*@-incondefs@*/
/*@unused@*/
int poptSaveBits(/*@null@*/ poptBits * bitsp, unsigned int argInfo,
/*@null@*/ const char * s)
/*@globals _poptBitsN, _poptBitsM, _poptBitsK, internalState @*/
/*@modifies *bitsp, _poptBitsN, _poptBitsM, _poptBitsK, internalStat
e @*/;
/*@=incondefs@*/
/*@=type@*/ /*@=type@*/
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 6 change blocks. 
2 lines changed or deleted 81 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/