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: 25-Jun-2016 22:50:13
Branch: rpm-5_4 Handle: 2016062520501300
Modified files: (Branch: rpm-5_4)
rpm/misc glob.c librpmmisc.vers
Log:
- compiler warnings.
Summary:
Revision Changes Path
1.22.2.3 +13 -56 rpm/misc/glob.c
1.35.2.13 +2 -0 rpm/misc/librpmmisc.vers
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/misc/glob.c
============================================================================
$ cvs diff -u -r1.22.2.2 -r1.22.2.3 glob.c
--- rpm/misc/glob.c 19 Jun 2016 06:48:47 -0000 1.22.2.2
+++ rpm/misc/glob.c 25 Jun 2016 20:50:13 -0000 1.22.2.3
@@ -1,25 +1,3 @@
-/*@-bounds@*/
-/*@-branchstate@*/
-/*@-compdef@*/
-/*@-immediatetrans@*/
-/*@-internalglobs@*/
-/*@-loopswitchbreak@*/
-/*@-modnomods@*/
-/*@-mods@*/
-/*@-moduncon@*/
-/*@-modunconnomods@*/
-/*@-noeffectuncon@*/
-/*@-nullpass@*/
-/*@-onlytrans@*/
-/*@-protoparammatch@*/
-/*@-retalias@*/
-/*@-retvalint@*/
-/*@-shadow@*/
-/*@-sizeoftype@*/
-/*@-temptrans@*/
-/*@-type@*/
-/*@-unqualifiedtrans@*/
-/*@-unrecog@*/
/* Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
@@ -43,8 +21,6 @@
#pragma alloca
#endif
-/*@access DIR@*/
-
# include "system.h"
/* Needed for offsetof() */
@@ -107,19 +83,21 @@
#define GLOB_INTERFACE_VERSION 1
-/*@null@*/
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+#define RPM_GNUC_PURE \
+ __attribute__((__pure__))
+#else
+#define RPM_GNUC_PURE
+#endif
+
static inline const char *next_brace_sub __P ((const char *begin))
- /*@*/;
+ RPM_GNUC_PURE;
static int glob_in_dir __P ((const char *pattern, const char *directory,
int flags,
int (*errfunc) (const char *, int),
- glob_t *pglob))
- /*@globals fileSystem @*/
- /*@modifies fileSystem @*/;
-static int prefix_array __P ((const char *prefix, char **array, size_t n))
- /*@*/;
-static int collated_compare __P ((const __ptr_t, const __ptr_t))
- /*@*/;
+ glob_t *pglob));
+static int prefix_array __P ((const char *prefix, char **array, size_t n));
+static int collated_compare __P ((const __ptr_t, const __ptr_t));
/* Find the end of the sub-pattern in a brace expression. We define
@@ -162,7 +140,8 @@
return cp;
}
-static int __glob_pattern_p (const char *pattern, int quote);
+static int __glob_pattern_p (const char *pattern, int quote)
+ RPM_GNUC_PURE;
/* Do glob searching for PATTERN, placing results in PGLOB.
The bits defined above may be set in FLAGS.
@@ -1244,25 +1223,3 @@
}
return GLOB_NOSPACE;
}
-/*@=unrecog@*/
-/*@=unqualifiedtrans@*/
-/*@=type@*/
-/*@=temptrans@*/
-/*@=sizeoftype@*/
-/*@=shadow@*/
-/*@=retvalint@*/
-/*@=retalias@*/
-/*@=protoparammatch@*/
-/*@=onlytrans@*/
-/*@=nullpass@*/
-/*@=noeffectuncon@*/
-/*@=modunconnomods@*/
-/*@=moduncon@*/
-/*@=mods@*/
-/*@=modnomods@*/
-/*@=loopswitchbreak@*/
-/*@=internalglobs@*/
-/*@=immediatetrans@*/
-/*@=compdef@*/
-/*@=branchstate@*/
-/*@=bounds@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/librpmmisc.vers
============================================================================
$ cvs diff -u -r1.35.2.12 -r1.35.2.13 librpmmisc.vers
--- rpm/misc/librpmmisc.vers 24 Jun 2016 19:04:19 -0000 1.35.2.12
+++ rpm/misc/librpmmisc.vers 25 Jun 2016 20:50:13 -0000 1.35.2.13
@@ -23,6 +23,8 @@
finiproctitle;
initproctitle;
setproctitle;
+ glob64;
+ globfree64;
gpsee_*;
JS_*;
js_*;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
