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: 18-Sep-2014 07:00:58
Branch: rpm-5_4 Handle: 2014091805005700
Modified files: (Branch: rpm-5_4)
rpm debug.h
Log:
- clang warnings.
Summary:
Revision Changes Path
2.7.4.6 +5 -2 rpm/debug.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/debug.h
============================================================================
$ cvs diff -u -r2.7.4.5 -r2.7.4.6 debug.h
--- rpm/debug.h 5 Sep 2011 12:36:59 -0000 2.7.4.5
+++ rpm/debug.h 18 Sep 2014 05:00:57 -0000 2.7.4.6
@@ -45,7 +45,8 @@
static inline void * DRD_xmalloc(size_t nb)
{
- void * ptr = xmalloc(nb);
+ void * ptr = malloc(nb);
+assert(ptr);
ANNOTATE_BENIGN_RACE_SIZED(ptr, nb, __FUNCTION__); /* XXX tsan sanity. */
return ptr;
}
@@ -54,13 +55,15 @@
{
size_t nb = nmemb * size;
void * ptr = DRD_xmalloc(nb);
+assert(ptr);
memset(ptr, 0, nb);
return ptr;
}
static inline void * DRD_xrealloc(void * ptr, size_t size)
{
- ptr = xrealloc(ptr, size);
+ ptr = realloc(ptr, size);
+assert(ptr);
ANNOTATE_BENIGN_RACE_SIZED(ptr, size, __FUNCTION__); /* XXX tsan sanity. */
return ptr;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
