diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1997-12-05 19:14:36 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1997-12-05 19:14:36 +0000 |
| commit | 10b18425f02750dea7647122e78304aef4c5a71f (patch) | |
| tree | f347ab2141a91c2ba5b8ecaf6341ae36d9b69bfe /sys/sys/malloc.h | |
| parent | a517984c8b4be3c32fb4348fa89ae9a2c9ba6b38 (diff) | |
| download | src-10b18425f02750dea7647122e78304aef4c5a71f.tar.gz src-10b18425f02750dea7647122e78304aef4c5a71f.zip | |
Removed one `const' from the declaration of `ks_shortdesc'. The pointer
isn't actually const in vmstat.
Fixed pedantic syntax errors caused by trailing semicolons in macro
definitions.
Fixed style bugs and typos in revisions 1.26-1.33.
Notes
Notes:
svn path=/head/; revision=31559
Diffstat (limited to 'sys/sys/malloc.h')
| -rw-r--r-- | sys/sys/malloc.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 12027bb8707c..22f0c6001bde 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)malloc.h 8.5 (Berkeley) 5/3/95 - * $Id: malloc.h,v 1.33 1997/12/05 05:36:49 dyson Exp $ + * $Id: malloc.h,v 1.34 1997/12/05 18:58:13 bde Exp $ */ #ifndef _SYS_MALLOC_H_ @@ -46,25 +46,26 @@ #define M_NOWAIT 0x0001 #define M_KERNEL 0x0002 -#define M_MAGIC 877983977 /* time when first defined :-) */ +#define M_MAGIC 877983977 /* time when first defined :-) */ struct malloc_type { - struct malloc_type *ks_next; /* Next pointer */ + struct malloc_type *ks_next; /* next in list */ long ks_memuse; /* total memory held in bytes */ long ks_limit; /* most that are allowed to exist */ long ks_size; /* sizes of this thing that are allocated */ long ks_inuse; /* # of packets of this type currently in use */ long ks_calls; /* total packets of this type ever allocated */ long ks_maxused; /* maximum number ever used */ - u_long ks_magic; /* If if's not magic, don't touch it */ - const char * const ks_shortdesc; /* Short description */ + u_long ks_magic; /* if it's not magic, don't touch it */ + const char *ks_shortdesc; /* short description */ u_short ks_limblocks; /* number of times blocked for hitting limit */ u_short ks_mapblocks; /* number of times blocked for kernel map */ }; #define MALLOC_DEFINE(type, shortdesc, longdesc) \ - struct malloc_type type[1] = { { NULL, 0, 0, 0, 0, 0, 0, \ - M_MAGIC, shortdesc, 0, 0 } }; \ + struct malloc_type type[1] = { \ + { NULL, 0, 0, 0, 0, 0, 0, M_MAGIC, shortdesc, 0, 0 } \ + }; \ struct __hack #define MALLOC_DECLARE(type) \ @@ -72,11 +73,11 @@ struct malloc_type { struct __hack #ifdef MALLOC_INSTANTIATE -#define MALLOC_MAKE_TYPE(type, shortdesc, longdesc) \ - MALLOC_DEFINE(type, shortdesc, longdesc); +#define MALLOC_MAKE_TYPE(type, shortdesc, longdesc) \ + MALLOC_DEFINE(type, shortdesc, longdesc) #else -#define MALLOC_MAKE_TYPE(type, shortdesc, longdesc) \ - MALLOC_DECLARE(type); +#define MALLOC_MAKE_TYPE(type, shortdesc, longdesc) \ + MALLOC_DECLARE(type) #endif MALLOC_MAKE_TYPE(M_CACHE, "namecache", "Dynamically allocated cache entries"); |