RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   15-Nov-2007 15:56:21
  Branch: HEAD                             Handle: 2007111514562100

  Modified files:
    rpm/rpmio               macro.c rpmdav.c rpmio.h rpmlua.c rpmmacro.h
                            rpmsq.c

  Log:
    - annotate recent rpmio changes.

  Summary:
    Revision    Changes     Path
    2.150       +3  -1      rpm/rpmio/macro.c
    2.50        +2  -0      rpm/rpmio/rpmdav.c
    1.61        +2  -2      rpm/rpmio/rpmio.h
    2.26        +4  -0      rpm/rpmio/rpmlua.c
    2.42        +1  -1      rpm/rpmio/rpmmacro.h
    1.29        +6  -2      rpm/rpmio/rpmsq.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.149 -r2.150 macro.c
  --- rpm/rpmio/macro.c	4 Nov 2007 00:23:08 -0000	2.149
  +++ rpm/rpmio/macro.c	15 Nov 2007 14:56:21 -0000	2.150
  @@ -214,7 +214,9 @@
       }
   }
   
  +/*@only@*/
   static char * dupMacroEntry(MacroEntry me)
  +	/*@*/
   {
       char * t, * te;
       size_t nb;
  @@ -227,7 +229,7 @@
   	nb += strlen(me->body) + sizeof("\t") - 1;
       nb++;
   
  -    te = t = xmalloc(nb);
  +    t = te = xmalloc(nb);
       *te = '\0';
       te = stpcpy( stpcpy(te, "%"), me->name);
       if (me->opts)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdav.c
  ============================================================================
  $ cvs diff -u -r2.49 -r2.50 rpmdav.c
  --- rpm/rpmio/rpmdav.c	9 Nov 2007 18:00:07 -0000	2.49
  +++ rpm/rpmio/rpmdav.c	15 Nov 2007 14:56:21 -0000	2.50
  @@ -31,6 +31,7 @@
   #include "ne_utils.h"
   #if !defined(HEADER_ERR_H)
   /* cheats to avoid having to explicitly build against OpenSSL */
  +/*@-exportheader@*/
   extern void ERR_remove_state(int foo);
   extern void ENGINE_cleanup(void);
   extern void CONF_modules_unload(int foo);
  @@ -38,6 +39,7 @@
   extern void EVP_cleanup(void);
   extern void CRYPTO_cleanup_all_ex_data(void);
   extern void CRYPTO_mem_leaks(void * ptr);
  +/*@=exportheader@*/
   #endif
   
   #include "ne_md5.h" /* for version detection only */
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.h
  ============================================================================
  $ cvs diff -u -r1.60 -r1.61 rpmio.h
  --- rpm/rpmio/rpmio.h	14 Nov 2007 23:56:35 -0000	1.60
  +++ rpm/rpmio/rpmio.h	15 Nov 2007 14:56:21 -0000	1.61
  @@ -895,8 +895,8 @@
    * Free all memory allocated by rpmio usage.
    */
   void rpmioClean(void)
  -	/*@globals internalState @*/
  -	/*@modifies internalState @*/;
  +	/*@globals internalState, fileSystem @*/
  +	/*@modifies internalState, fileSystem @*/;
   
   #ifdef __cplusplus
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmlua.c
  ============================================================================
  $ cvs diff -u -r2.25 -r2.26 rpmlua.c
  --- rpm/rpmio/rpmlua.c	3 Nov 2007 16:01:26 -0000	2.25
  +++ rpm/rpmio/rpmlua.c	15 Nov 2007 14:56:21 -0000	2.26
  @@ -633,7 +633,9 @@
       int ac = 0;
       int i;
   
  +/*@-modunconnomods@*/
       lua_newtable(L);
  +/*@=modunconnomods@*/
   
       ac = rpmGetMacroEntries(NULL, NULL, -1, &av);
   
  @@ -653,6 +655,7 @@
   	}
   	b++;
   
  +/*@-modunconnomods@*/
           lua_pushstring(L, n);
           lua_newtable(L);
           if (o) {
  @@ -666,6 +669,7 @@
               lua_settable(L, -3);
           }
           lua_settable(L, -3);
  +/*@=modunconnomods@*/
       }
       av = argvFree(av);
       return 1;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmmacro.h
  ============================================================================
  $ cvs diff -u -r2.41 -r2.42 rpmmacro.h
  --- rpm/rpmio/rpmmacro.h	3 Nov 2007 13:19:23 -0000	2.41
  +++ rpm/rpmio/rpmmacro.h	15 Nov 2007 14:56:21 -0000	2.42
  @@ -84,7 +84,7 @@
   rpmGetMacroEntries(/*@null@*/ MacroContext mc, /*@null@*/ miRE mire,
   		int used, /*@null@*/ const char *** avp)
   	/*@globals rpmGlobalMacroContext @*/
  -	/*@modifies *avp @*/;
  +	/*@modifies mire, *avp @*/;
   
   /**
    * Return URL path(s) from a (URL prefixed) pattern glob.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmsq.c
  ============================================================================
  $ cvs diff -u -r1.28 -r1.29 rpmsq.c
  --- rpm/rpmio/rpmsq.c	12 Nov 2007 13:22:03 -0000	1.28
  +++ rpm/rpmio/rpmsq.c	15 Nov 2007 14:56:21 -0000	1.29
  @@ -205,9 +205,11 @@
   #define	SAME_THREAD(_a, _b)	pthread_equal(((pthread_t)_a), ((pthread_t)_b))
   
   #define ME() __tid2vp(pthread_self())
  +/*@shared@*/
   static void *__tid2vp(pthread_t tid)
  +	/*@*/
   {
  -    union { pthread_t tid; void *vp; } u;
  +    union { pthread_t tid; /*@shared@*/ void *vp; } u;
       u.tid = tid;
       return u.vp;
   }
  @@ -225,9 +227,11 @@
   #define	SAME_THREAD(_a, _b)	(42)
   
   #define ME() __pid2vp(getpid())
  +/*@shared@*/
   static void *__pid2vp(pid_t pid)
  +	/*@*/
   {
  -    union { pid_t pid; void *vp; } u;
  +    union { pid_t pid; /*@shared@*/ void *vp; } u;
       u.pid = pid;
       return u.vp;
   }
  @@ .