RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: popt Date: 18-Dec-2008 17:55:43 Branch: HEAD Handle: 2008121816554300 Modified files: popt CHANGES libpopt.vers popt.c poptint.h Log: - jbj: permit type/group bitmasks to be changed (if needed somewhen). Summary: Revision Changes Path 1.92 +1 -0 popt/CHANGES 1.4 +2 -0 popt/libpopt.vers 1.124 +6 -1 popt/popt.c 1.39 +8 -2 popt/poptint.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: popt/CHANGES ============================================================================ $ cvs diff -u -r1.91 -r1.92 CHANGES --- popt/CHANGES 18 Dec 2008 03:54:41 -0000 1.91 +++ popt/CHANGES 18 Dec 2008 16:55:43 -0000 1.92 @@ -1,4 +1,5 @@ 1.14 -> 1.15: + - jbj: permit type/group bitmasks to be changed (if needed somewhen). - jbj: snip out 8 unused bits for argument groups. - jbj: fix: eliminate dead code (CID#5). - jbj: fix: rearrange code to better hint to coverity scan (CID#9). @@ . patch -p0 <<'@@ .' Index: popt/libpopt.vers ============================================================================ $ cvs diff -u -r1.3 -r1.4 libpopt.vers --- popt/libpopt.vers 13 Feb 2008 01:32:35 -0000 1.3 +++ popt/libpopt.vers 18 Dec 2008 16:55:43 -0000 1.4 @@ -3,6 +3,8 @@ global: _fini; _init; + _poptArgMask; + _poptGroupMask; poptAddAlias; poptAddItem; poptAliasOptions; @@ . patch -p0 <<'@@ .' Index: popt/popt.c ============================================================================ $ cvs diff -u -r1.123 -r1.124 popt.c --- popt/popt.c 25 Oct 2008 19:02:58 -0000 1.123 +++ popt/popt.c 18 Dec 2008 16:55:43 -0000 1.124 @@ -30,6 +30,11 @@ int _popt_debug = 0; #endif +/*...@unchecked@*/ +unsigned int _poptArgMask = POPT_ARG_MASK; +/*...@unchecked@*/ +unsigned int _poptGroupMask = POPT_GROUP_MASK; + #if !defined(HAVE_STRERROR) && !defined(__LCLINT__) static char * strerror(int errno) { @@ -176,7 +181,7 @@ con->os->argb = NULL; if (!(flags & POPT_CONTEXT_KEEP_FIRST)) - con->os->next = 1; /* skip argv[0] */ + con->os->next = 1; /* skip argv[0] */ con->leftovers = calloc( (size_t)(argc + 1), sizeof(*con->leftovers) ); /*...@-dependenttrans -assignexp...@*/ /* FIX: W2DO? */ @@ . patch -p0 <<'@@ .' Index: popt/poptint.h ============================================================================ $ cvs diff -u -r1.38 -r1.39 poptint.h --- popt/poptint.h 18 Dec 2008 03:54:41 -0000 1.38 +++ popt/poptint.h 18 Dec 2008 16:55:43 -0000 1.39 @@ -69,8 +69,14 @@ } poptArg; /*...@=exporttype =field...@*/ -#define poptArgType(_opt) ((_opt)->argInfo & POPT_ARG_MASK) -#define poptGroup(_opt) ((_opt)->argInfo & POPT_GROUP_MASK) +/*...@unchecked@*/ +extern unsigned int _poptArgMask; +/*...@unchecked@*/ +extern unsigned int _poptGroupMask; + +#define poptArgType(_opt) ((_opt)->argInfo & _poptArgMask) +#define poptGroup(_opt) ((_opt)->argInfo & _poptGroupMask) + #define F_ISSET(_opt, _FLAG) ((_opt)->argInfo & POPT_ARGFLAG_##_FLAG) #define LF_ISSET(_FLAG) (argInfo & POPT_ARGFLAG_##_FLAG) #define CBF_ISSET(_opt, _FLAG) ((_opt)->argInfo & POPT_CBFLAG_##_FLAG) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org