Use malloc/realloc/free instead of the "near" counterparts. The

functions _nmalloc, _nrealloc, and _nfree don't seem to exist under win32
and the pointer manipulation is more complex than if we simply just use
the "normal" counterparts with a large-memory model build.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9940 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 97b7d21a3f8af229fe97ee784e36ca4eac4576bd..61d4e26a28c3089bb7b2dee759e987b7414e7369 100644 (file)
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 20 23:27:39 1997  Richard Basch  <basch@lehman.com>
+
+       * memcache.c: Just use malloc/free, since _nmalloc isn't on
+               all versions of Windows.
+
 Sun Feb 16 21:11:51 1997  Richard Basch  <basch@lehman.com>
 
        * Makefile.in: Win16/Win32 cleanup

diff --git a/src/lib/krb4/memcache.c b/src/lib/krb4/memcache.c
index 707b58a4c2a627c59f36317eeaf134de8b6a4f29..7484342aaa7366b732bfe35dea983e7b4051be7a 100644 (file)
--- a/src/lib/krb4/memcache.c
+++ b/src/lib/krb4/memcache.c
@@ -21,10 +21,6 @@ typedef DWORD OSErr;
 #define noErr 0
 #define cKrbCredsDontExist 12001
 #define cKrbSessDoesntExist 12002
-#define OFFSETOF(x) x
-#define _nmalloc malloc
-#define _nrealloc realloc
-#define _nfree free
 #define memFullErr ENOMEM
 #endif
 
@@ -45,12 +41,6 @@ typedef DWORD OSErr;
 extern char *malloc (), *realloc ();
 #endif
 
-#define _nmalloc malloc
-#define _nfree free
-#define _nrealloc realloc
-#define NPSTR char *
-#define OFFSETOF(x) x
-
 typedef int OSErr;
 #define noErr 0
 #define memFullErr ENOMEM
@@ -89,7 +79,7 @@ NewHandleSys(s)
 {
        Handle h;
 
-       h = (char **) _nmalloc(sizeof(char *));
+       h = (char **) malloc(sizeof(char *));
 
        if (h == NULL) {
                memerror = memFullErr;
@@ -97,10 +87,10 @@ NewHandleSys(s)
        }
 
        if (s > 0) {
-               *h = _nmalloc(s);
+               *h = malloc(s);
 
                if (*h == NULL) {
-                       _nfree((NPSTR) OFFSETOF(h));
+                       free(h);
                        memerror = memFullErr;
                        return (NULL);
                }
@@ -123,9 +113,8 @@ DisposHandle(h)
        Handle h;
 {
        if (*h != NULL)
-               _nfree((NPSTR) OFFSETOF(*h));
-
-       _nfree((NPSTR) OFFSETOF(h));
+               free(*h);
+       free(h);
 }
 
 /*
@@ -142,23 +131,21 @@ SetHandleSize(h, s)
 {
        if (*h != NULL) {
                if (s > 0) {
-                       *h = _nrealloc((NPSTR) OFFSETOF(*h), s);
-
+                       *h = realloc(*h, s);
                        if (*h == NULL) {
                                memerror = memFullErr;
                                return;
                        }
                }
                else {
-                       _nfree((NPSTR) OFFSETOF(*h));
+                       free(*h);
                        *h = NULL;
                }
        }
 
        else {
                if (s > 0) {
-                       *h = _nmalloc(s);
-
+                       *h = malloc(s);
                        if (*h == NULL) {
                                memerror = memFullErr;
                                return;