summaryrefslogtreecommitdiffstats
path: root/lib.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-10-17 08:17:49 -0700
committerKaz Kylheku <kaz@kylheku.com>2014-10-17 08:17:49 -0700
commit9f158a44b7e88c1dcfb8d56f4f85d642fc423b59 (patch)
tree336dc9997f047c3ea954312b3dbc715157de0b67 /lib.c
parent499f04dc4f9f864071d6ff7e75c9cbec60e2fd12 (diff)
downloadtxr-9f158a44b7e88c1dcfb8d56f4f85d642fc423b59.tar.gz
txr-9f158a44b7e88c1dcfb8d56f4f85d642fc423b59.tar.bz2
txr-9f158a44b7e88c1dcfb8d56f4f85d642fc423b59.zip
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.
Diffstat (limited to 'lib.c')
-rw-r--r--lib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib.c b/lib.c
index 4b929c97..33717864 100644
--- a/lib.c
+++ b/lib.c
@@ -5177,7 +5177,7 @@ void cobj_print_op(val obj, val out)
{
put_string(lit("#<"), out);
obj_print(obj->co.cls, out);
- format(out, lit(": ~p>"), obj->co.handle, nao);
+ format(out, lit(": ~p>"), (val) obj->co.handle, nao);
}
static val cptr_equal_op(val left, val right)
@@ -6555,11 +6555,11 @@ finish:
obj->co.ops->print(obj, out);
return obj;
case ENV:
- format(out, lit("#<environment: ~p>"), (void *) obj, nao);
+ format(out, lit("#<environment: ~p>"), obj, nao);
return obj;
}
- format(out, lit("#<garbage: ~p>"), (void *) obj, nao);
+ format(out, lit("#<garbage: ~p>"), obj, nao);
return obj;
}
@@ -6686,11 +6686,11 @@ finish:
obj->co.ops->print(obj, out);
return obj;
case ENV:
- format(out, lit("#<environment: ~p>"), (void *) obj, nao);
+ format(out, lit("#<environment: ~p>"), obj, nao);
return obj;
}
- format(out, lit("#<garbage: ~p>"), (void *) obj, nao);
+ format(out, lit("#<garbage: ~p>"), obj, nao);
return obj;
}