|
|
@@ -10,7 +10,7 @@
|
|
|
## 'patch' tool to upgrade those files. Each patch snippet is annotated
|
|
|
## with a short description.
|
|
|
##
|
|
|
-## Created on: 14-Oct-2003
|
|
|
+## Created on: 15-Oct-2003
|
|
|
##
|
|
|
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
|
|
|
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
|
|
|
@@ -280,7 +280,7 @@ Index: tools/Makefile.in
|
|
|
+---------------------------------------------------------------------------
|
|
|
Index: file/system.h
|
|
|
--- file/system.h 24 Jan 2003 19:41:56 -0000 1.1.1.1
|
|
|
-+++ file/system.h 14 Oct 2003 18:20:45 -0000
|
|
|
++++ file/system.h 15 Oct 2003 10:09:30 -0000
|
|
|
@@ -53,6 +53,8 @@
|
|
|
#else
|
|
|
#if HAVE_ERROR && HAVE_ERROR_H
|
|
|
@@ -302,7 +302,7 @@ Index: file/system.h
|
|
|
/*@globals fileSystem @*/
|
|
|
/*@modifies fileSystem @*/
|
|
|
{
|
|
|
-@@ -286,9 +292,15 @@
|
|
|
+@@ -286,9 +292,33 @@
|
|
|
|
|
|
#if !defined(__LCLINT__)
|
|
|
/* Memory allocation via macro defs to get meaningful locations from mtrace() */
|
|
|
@@ -311,14 +311,32 @@ Index: file/system.h
|
|
|
#define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? : vmefail(0))
|
|
|
#define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? : vmefail(0))
|
|
|
+#else
|
|
|
-+#define xmalloc(_size) (malloc(_size) || vmefail(0))
|
|
|
-+#define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) || vmefail(0))
|
|
|
-+#define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) || vmefail(0))
|
|
|
++static void *xmalloc(size_t size)
|
|
|
++{
|
|
|
++ void *vp = malloc(size);
|
|
|
++ if (vp == NULL)
|
|
|
++ vmefail(0);
|
|
|
++ return vp;
|
|
|
++}
|
|
|
++static void *xcalloc(size_t number, size_t size)
|
|
|
++{
|
|
|
++ void *vp = calloc(number, size);
|
|
|
++ if (vp == NULL)
|
|
|
++ vmefail(0);
|
|
|
++ return vp;
|
|
|
++}
|
|
|
++static void *xrealloc(void *ptr, size_t size)
|
|
|
++{
|
|
|
++ void *vp = realloc(ptr, size);
|
|
|
++ if (vp == NULL)
|
|
|
++ vmefail(0);
|
|
|
++ return vp;
|
|
|
++}
|
|
|
+#endif
|
|
|
#define xstrdup(_str) (strcpy(xmalloc(strlen(_str)+1), (_str)))
|
|
|
#endif
|
|
|
|
|
|
-@@ -314,9 +326,14 @@
|
|
|
+@@ -314,9 +344,14 @@
|
|
|
|
|
|
#if defined(__LCLINT__)
|
|
|
#define FILE_RCSID(id)
|
