diff options
| author | Richard Basch <probe@mit.edu> | 1997-02-21 04:39:08 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1997-02-21 04:39:08 +0000 |
| commit | fecbcd05c7200985159ed65826cada19b12effa9 (patch) | |
| tree | 98d97b96b7ac4b3e67523d874cd838a6426ede8d /src | |
| parent | d6d793ff482fbdb7c5bb903f8a73a4bf4b209747 (diff) | |
| download | krb5-fecbcd05c7200985159ed65826cada19b12effa9.tar.gz krb5-fecbcd05c7200985159ed65826cada19b12effa9.tar.xz krb5-fecbcd05c7200985159ed65826cada19b12effa9.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb4/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb4/memcache.c | 29 |
2 files changed, 13 insertions, 21 deletions
diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 97b7d21a3..61d4e26a2 100644 --- 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 707b58a4c..7484342aa 100644 --- 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; |