Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sbin/modload Use "type *" instead of "type*".
details: https://anonhg.NetBSD.org/src/rev/8141fd44a328
branches: trunk
changeset: 537870:8141fd44a328
user: simonb <simonb%NetBSD.org@localhost>
date: Mon Oct 07 02:33:55 2002 +0000
description:
Use "type *" instead of "type*".
diffstat:
sbin/modload/a.out.c | 6 +++---
sbin/modload/elf.c | 20 ++++++++++----------
sbin/modload/modload.c | 10 +++++-----
sbin/modload/modload.h | 14 +++++++-------
4 files changed, 25 insertions(+), 25 deletions(-)
diffs (188 lines):
diff -r 4c7123543393 -r 8141fd44a328 sbin/modload/a.out.c
--- a/sbin/modload/a.out.c Mon Oct 07 02:00:23 2002 +0000
+++ b/sbin/modload/a.out.c Mon Oct 07 02:33:55 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: a.out.c,v 1.2 2002/10/06 13:23:00 simonb Exp $ */
+/* $NetBSD: a.out.c,v 1.3 2002/10/07 02:33:55 simonb Exp $ */
/*
* Copyright (c) 1993 Terrence R. Lambert.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: a.out.c,v 1.2 2002/10/06 13:23:00 simonb Exp $");
+__RCSID("$NetBSD: a.out.c,v 1.3 2002/10/07 02:33:55 simonb Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -170,7 +170,7 @@
loadbuf(buf, n);
b -= n;
}
- return (void*)info_buf.a_entry;
+ return (void *)info_buf.a_entry;
}
void
diff -r 4c7123543393 -r 8141fd44a328 sbin/modload/elf.c
--- a/sbin/modload/elf.c Mon Oct 07 02:00:23 2002 +0000
+++ b/sbin/modload/elf.c Mon Oct 07 02:33:55 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: elf.c,v 1.11 2002/10/06 13:23:00 simonb Exp $ */
+/* $NetBSD: elf.c,v 1.12 2002/10/07 02:33:55 simonb Exp $ */
/*
* Copyright (c) 1998 Johan Danielsson <joda%pdc.kth.se@localhost>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: elf.c,v 1.11 2002/10/06 13:23:00 simonb Exp $");
+__RCSID("$NetBSD: elf.c,v 1.12 2002/10/07 02:33:55 simonb Exp $");
#include <sys/param.h>
@@ -118,7 +118,7 @@
errx(1, "failed to allocate %lu bytes", (u_long)sizeof(*s));
s->name = shstrtab + shdr.sh_name;
s->type = shdr.sh_type;
- s->addr = (void*)shdr.sh_addr;
+ s->addr = (void *)shdr.sh_addr;
s->offset = shdr.sh_offset;
s->size = shdr.sh_size;
s->align = shdr.sh_addralign;
@@ -270,13 +270,13 @@
s->name, s->addr, (u_long)s->size, (u_long)s->align);
/* XXX try to get rid of the hole before the data
section that GNU-ld likes to put there */
- if (strcmp(s->name, ".data") == 0 && s->addr > (void*)off) {
+ if (strcmp(s->name, ".data") == 0 && s->addr > (void *)off) {
#define ROUND(V, S) (((V) + (S) - 1) & ~((S) - 1))
data_offset = ROUND(off, s->align);
if (debug)
fprintf(stderr, ".data section forced to "
"offset %p (was %p)\n",
- (void*)data_offset,
+ (void *)data_offset,
s->addr);
/* later remove size of compressed hole from off */
data_hole = (ssize_t)s->addr - data_offset;
@@ -342,7 +342,7 @@
else
n = snprintf(buf, len, LINKCMD2, kernel, entry,
outfile, address,
- (const char*)address + data_offset, object);
+ (const char *)address + data_offset, object);
if (n >= len)
errx(1, "link command longer than %lu bytes", (u_long)len);
}
@@ -381,8 +381,8 @@
/* if there is a gap in the prelinked
module, transfer some empty
space... */
- zero_size += (char*)s->addr
- - (char*)addr;
+ zero_size += (char *)s->addr
+ - (char *)addr;
}
if (zero_size) {
loadspace(zero_size);
@@ -400,7 +400,7 @@
loadbuf(buf, n);
b -= n;
}
- addr = (char*)s->addr + s->size;
+ addr = (char *)s->addr + s->size;
}
}
}
@@ -409,7 +409,7 @@
free_sections(head);
free(shstrtab);
- return (void*)ehdr.e_entry;
+ return (void *)ehdr.e_entry;
}
void
diff -r 4c7123543393 -r 8141fd44a328 sbin/modload/modload.c
--- a/sbin/modload/modload.c Mon Oct 07 02:00:23 2002 +0000
+++ b/sbin/modload/modload.c Mon Oct 07 02:33:55 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: modload.c,v 1.33 2002/10/06 13:23:00 simonb Exp $ */
+/* $NetBSD: modload.c,v 1.34 2002/10/07 02:33:55 simonb Exp $ */
/*
* Copyright (c) 1993 Terrence R. Lambert.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: modload.c,v 1.33 2002/10/06 13:23:00 simonb Exp $");
+__RCSID("$NetBSD: modload.c,v 1.34 2002/10/07 02:33:55 simonb Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -249,7 +249,7 @@
struct stat stb;
int strtablen;
size_t modsize; /* XXX */
- void* modentry; /* XXX */
+ void *modentry; /* XXX */
int noready = 0, old = 0;
while ((c = getopt(argc, argv, "dnvsA:Se:p:o:")) != -1) {
@@ -398,9 +398,9 @@
/*
* Relink at kernel load address
*/
- if (prelink(kname, entry, out, (void*)resrv.addr, modobj))
+ if (prelink(kname, entry, out, (void *)resrv.addr, modobj))
errx(1, "can't link `%s' creating `%s' bound to %p",
- modobj, out, (void*)resrv.addr);
+ modobj, out, (void *)resrv.addr);
/*
* Open the relinked module to load it...
diff -r 4c7123543393 -r 8141fd44a328 sbin/modload/modload.h
--- a/sbin/modload/modload.h Mon Oct 07 02:00:23 2002 +0000
+++ b/sbin/modload/modload.h Mon Oct 07 02:33:55 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: modload.h,v 1.3 2002/10/06 13:23:00 simonb Exp $ */
+/* $NetBSD: modload.h,v 1.4 2002/10/07 02:33:55 simonb Exp $ */
/*
* Copyright (c) 1993 Terrence R. Lambert.
@@ -37,15 +37,15 @@
int elf_mod_sizes(int, size_t *, int *, struct lmc_resrv *, struct stat *);
void *elf_mod_load(int);
-void elf_linkcmd(char*, size_t, const char*, const char*, const char*,
- const void*, const char*);
+void elf_linkcmd(char *, size_t, const char *, const char *, const char *,
+ const void *, const char *);
void elf_mod_symload(int);
int a_out_mod_sizes(int, size_t *, int *, struct lmc_resrv *,
struct stat *);
void *a_out_mod_load(int);
-void a_out_linkcmd(char*, size_t, const char*, const char*, const char*,
- const void*, const char*);
+void a_out_linkcmd(char *, size_t, const char *, const char *, const char *,
+ const void *, const char *);
void a_out_mod_symload(int);
#ifndef USE_AOUT
@@ -60,9 +60,9 @@
#define linkcmd a_out_linkcmd
#endif
-void loadbuf(void*, size_t);
+void loadbuf(void *, size_t);
void loadspace(size_t);
-void loadsym(void*, size_t);
+void loadsym(void *, size_t);
extern int debug;
extern int devfd;
Home |
Main Index |
Thread Index |
Old Index