From 9f158a44b7e88c1dcfb8d56f4f85d642fc423b59 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 17 Oct 2014 08:17:49 -0700 Subject: Purge stray occurrences of "void *" from code base. * lib.c (cobj_print_op): In the format call, cast the C pointer to val, since the ~p conversion now takes a val rather than void *. (cptr_equal_op, obj_print, obj_pprint): Remove cast to void *, since obj now already has the type that ~p expects. * lib.h (struct any): Use mem_t * instead of void *. * parser.h (yyscan_t): Repeat the definition from inside the Flex-generated lex.yy.c. (yylex_init, yylex_destroy, yyget_extra, yyset_extra): Re-declare using yyscan_t typedef in place of void *. * parser.l (yyget_column, yyerrprepf): Re-declare using yyscan_t. (grammar): Use yyg in place of yyscanner in calls to yyerrprepf. * parser.y (yylex, %lex-param): Use yyscan_t instead of void *. (parse): Use yyscan_t for local variable. * signal.c (stack): Change type from void * to mem_t *. * stream.c (vformat): Conversion specifier p extracts val instead of void *. (run): Use casts that only remove const, not all the way to void *. * txr.1: Documented p conversion specifier of format. * Makefile (OBJS-y): Initialize with := to make sure it is a simple variable, and not a macro. (SRCS): New variable, listing source files. (enforce): New rule for enforcing coding conventions. Currently checks for void * occurrences. --- stream.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'stream.c') diff --git a/stream.c b/stream.c index 48943fb4..7d2b39bb 100644 --- a/stream.c +++ b/stream.c @@ -1511,7 +1511,6 @@ val vformat(val stream, val fmtstr, va_list vl) int width = 0, precision = 0, precision_p = 0, digits = 0; int left = 0, sign = 0, zeropad = 0; cnum value; - void *ptr; for (;;) { val obj; @@ -1810,9 +1809,11 @@ val vformat(val stream, val fmtstr, va_list vl) obj_print(obj, stream); continue; case 'p': - ptr = va_arg(vl, void *); - value = (cnum) ptr; - sprintf(num_buf, num_fmt->hex, value); + { + val ptr = va_arg(vl, val); + value = (cnum) ptr; + sprintf(num_buf, num_fmt->hex, value); + } goto output_num; default: uw_throwf(error_s, lit("unknown format directive character ~s\n"), @@ -2350,8 +2351,8 @@ static val run(val command, val args) status = _wspawnvp(_P_WAIT, c_str(command), wargv); for (i = 0; i < nargs; i++) - free((void *) wargv[i]); - free((void *) wargv); + free((wchar_t *) wargv[i]); + free((wchar_t **) wargv); rel1(&args); -- cgit v1.2.3