RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 03-May-2017 16:42:37
Branch: rpm-5_4 Handle: 2017050314423700
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmpython.c rpmpython.h
Log:
- splint: RIP.
Summary:
Revision Changes Path
2.16.2.12 +2 -5 rpm/rpmio/rpmpython.c
2.10.2.3 +7 -29 rpm/rpmio/rpmpython.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpython.c
============================================================================
$ cvs diff -u -r2.16.2.11 -r2.16.2.12 rpmpython.c
--- rpm/rpmio/rpmpython.c 27 Jun 2016 03:05:58 -0000 2.16.2.11
+++ rpm/rpmio/rpmpython.c 3 May 2017 14:42:37 -0000 2.16.2.12
@@ -3,6 +3,8 @@
#endif
#if defined(WITH_PYTHONEMBED)
+#define DONT_HAVE_STAT /* XXX /usr/include/python2.7/pyport.h
*/
+#define DONT_HAVE_FSTAT /* XXX /usr/include/python2.7/pyport.h
*/
#include <Python.h>
#include <cStringIO.h>
#endif
@@ -21,8 +23,6 @@
#include "debug.h"
static void rpmpythonFini(void * _python)
- /*@globals fileSystem @*/
- /*@modifies *_python, fileSystem @*/
{
rpmpython python = (rpmpython) _python;
@@ -32,12 +32,10 @@
python->I = NULL;
}
-/*@unchecked@*/
int _rpmpython_debug = 0;
RPMIOPOOL_INTERP_MODULE(python)
-/*@unchecked@*/
#if defined(WITH_PYTHONEMBED)
static const char * _rpmpythonI_init = "\
import sys\n\
@@ -179,7 +177,6 @@
}
static const char * rpmpythonSlurp(const char * arg)
- /*@*/
{
rpmiob iob = NULL;
const char * val = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpython.h
============================================================================
$ cvs diff -u -r2.10.2.2 -r2.10.2.3 rpmpython.h
--- rpm/rpmio/rpmpython.h 27 Sep 2014 15:51:24 -0000 2.10.2.2
+++ rpm/rpmio/rpmpython.h 3 May 2017 14:42:37 -0000 2.10.2.3
@@ -8,22 +8,16 @@
#include <rpmiotypes.h>
#include <rpmio.h>
-typedef /*@abstract@*/ /*@refcounted@*/ struct rpmpython_s * rpmpython;
+typedef struct rpmpython_s * rpmpython;
-/*@unchecked@*/
extern int _rpmpython_debug;
-/*@unchecked@*/ /*@relnull@*/
extern rpmpython _rpmpythonI;
#if defined(_RPMPYTHON_INTERNAL)
struct rpmpython_s {
struct rpmioItem_s _item; /*!< usage mutex and pool identifier. */
void * I; /* (unused) */
-#if defined(__LCLINT__)
-/*@refs@*/
- int nrefs; /*!< (unused) keep splint happy */
-#endif
};
#endif /* _RPMPYTHON_INTERNAL */
@@ -36,9 +30,7 @@
* @param python python interpreter
* @return NULL on last dereference
*/
-/*@unused@*/ /*@null@*/
-rpmpython rpmpythonUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmpython
python)
- /*@modifies python @*/;
+rpmpython rpmpythonUnlink (rpmpython python);
#define rpmpythonUnlink(_python) \
((rpmpython)rpmioUnlinkPoolItem((rpmioItem)(_python), __FUNCTION__,
__FILE__, __LINE__))
@@ -47,9 +39,7 @@
* @param python python interpreter
* @return new python interpreter reference
*/
-/*@unused@*/ /*@newref@*/ /*@null@*/
-rpmpython rpmpythonLink (/*@null@*/ rpmpython python)
- /*@modifies python @*/;
+rpmpython rpmpythonLink (rpmpython python);
#define rpmpythonLink(_python) \
((rpmpython)rpmioLinkPoolItem((rpmioItem)(_python), __FUNCTION__,
__FILE__, __LINE__))
@@ -58,10 +48,7 @@
* @param python python interpreter
* @return NULL on last dereference
*/
-/*@null@*/
-rpmpython rpmpythonFree(/*@killref@*/ /*@null@*/rpmpython python)
- /*@globals fileSystem @*/
- /*@modifies python, fileSystem @*/;
+rpmpython rpmpythonFree(rpmpython python);
#define rpmpythonFree(_python) \
((rpmpython)rpmioFreePoolItem((rpmioItem)(_python), __FUNCTION__,
__FILE__, __LINE__))
@@ -71,10 +58,7 @@
* @param flags python interpreter flags ((1<<31): use global
interpreter)
* @return new python interpreter
*/
-/*@newref@*/ /*@null@*/
-rpmpython rpmpythonNew(/*@null@*/ char ** av, uint32_t flags)
- /*@globals fileSystem, internalState @*/
- /*@modifies fileSystem, internalState @*/;
+rpmpython rpmpythonNew(char **av, uint32_t flags);
/**
* Execute python from a file.
@@ -83,10 +67,7 @@
* @param resultp *resultp python exec result
* @return RPMRC_OK on success
*/
-rpmRC rpmpythonRunFile(rpmpython python, /*@null@*/ const char * fn,
- /*@null@*/ const char ** resultp)
- /*@globals fileSystem, internalState @*/
- /*@modifies python, fileSystem, internalState @*/;
+rpmRC rpmpythonRunFile(rpmpython python, const char *fn, const char
**resultp);
/**
* Execute python string.
@@ -95,10 +76,7 @@
* @param resultp *resultp python exec result
* @return RPMRC_OK on success
*/
-rpmRC rpmpythonRun(rpmpython python, /*@null@*/ const char * str,
- /*@null@*/ const char ** resultp)
- /*@globals fileSystem, internalState @*/
- /*@modifies python, *resultp, fileSystem, internalState @*/;
+rpmRC rpmpythonRun(rpmpython python, const char *str, const char **resultp);
#ifdef __cplusplus
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
