Module Name: src
Committed By: christos
Date: Sat Nov 4 01:52:09 UTC 2017
Modified Files:
src/sys/dev/wscons: wsdisplay_compat_usl.c wsdisplay_glyphcache.c
Log Message:
use sizeof(*var) instead of sizeof(type)
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/wscons/wsdisplay_compat_usl.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/wscons/wsdisplay_glyphcache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsdisplay_compat_usl.c
diff -u src/sys/dev/wscons/wsdisplay_compat_usl.c:1.50 src/sys/dev/wscons/wsdisplay_compat_usl.c:1.51
--- src/sys/dev/wscons/wsdisplay_compat_usl.c:1.50 Fri Nov 3 09:34:56 2017
+++ src/sys/dev/wscons/wsdisplay_compat_usl.c Fri Nov 3 21:52:09 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_compat_usl.c,v 1.50 2017/11/03 13:34:56 maya Exp $ */
+/* $NetBSD: wsdisplay_compat_usl.c,v 1.51 2017/11/04 01:52:09 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.50 2017/11/03 13:34:56 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.51 2017/11/04 01:52:09 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_freebsd.h"
@@ -101,7 +101,7 @@ usl_sync_init(struct wsscreen *scr, stru
struct usl_syncdata *sd;
int res;
- sd = kmem_alloc(sizeof(struct usl_syncdata), KM_SLEEP);
+ sd = kmem_alloc(sizeof(*sd), KM_SLEEP);
sd->s_scr = scr;
sd->s_proc = p;
@@ -116,7 +116,7 @@ usl_sync_init(struct wsscreen *scr, stru
callout_setfunc(&sd->s_detach_ch, usl_detachtimeout, sd);
res = wsscreen_attach_sync(scr, &usl_syncops, sd);
if (res) {
- kmem_free(sd, sizeof(struct usl_syncdata));
+ kmem_free(sd, sizeof(*sd));
return (res);
}
*sdp = sd;
@@ -135,7 +135,7 @@ usl_sync_done(struct usl_syncdata *sd)
(*sd->s_callback)(sd->s_cbarg, ENXIO, 0);
}
wsscreen_detach_sync(sd->s_scr);
- kmem_free(sd, sizeof(struct usl_syncdata));
+ kmem_free(sd, sizeof(*sd));
}
static int
Index: src/sys/dev/wscons/wsdisplay_glyphcache.c
diff -u src/sys/dev/wscons/wsdisplay_glyphcache.c:1.9 src/sys/dev/wscons/wsdisplay_glyphcache.c:1.10
--- src/sys/dev/wscons/wsdisplay_glyphcache.c:1.9 Fri Jun 2 15:30:10 2017
+++ src/sys/dev/wscons/wsdisplay_glyphcache.c Fri Nov 3 21:52:09 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_glyphcache.c,v 1.9 2017/06/02 19:30:10 macallan Exp $ */
+/* $NetBSD: wsdisplay_glyphcache.c,v 1.10 2017/11/04 01:52:09 christos Exp $ */
/*
* Copyright (c) 2012 Michael Lorenz
@@ -74,7 +74,9 @@ glyphcache_init(glyphcache *gc, int firs
gc->gc_lines = lines;
gc->gc_buckets = NULL;
gc->gc_numbuckets = 0;
- gc->gc_buckets = kmem_alloc(sizeof(gc_bucket) * NBUCKETS, KM_SLEEP);
+ // XXX: Never free?
+ gc->gc_buckets = kmem_alloc(sizeof(*gc->gc_buckets) * NBUCKETS,
+ KM_SLEEP);
gc->gc_nbuckets = NBUCKETS;
return glyphcache_reconfig(gc, cellwidth, cellheight, attr);
