summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2003-03-17 08:22:48 +0000
committerphk <phk@FreeBSD.org>2003-03-17 08:22:48 +0000
commit884a12a930bfdf3153ad6663b0ccf56a3532b264 (patch)
treef40e2c5e59e1b55f6b5b4f9b27e26a2f94803f3d /lib
parent2971bf65abd09d9806ded25cd1a831860883d026 (diff)
downloadFreeBSD-src-884a12a930bfdf3153ad6663b0ccf56a3532b264.zip
FreeBSD-src-884a12a930bfdf3153ad6663b0ccf56a3532b264.tar.gz
Constify arg to geom_lookupid().
Improve a diagnostic printf.
Diffstat (limited to 'lib')
-rw-r--r--lib/libgeom/geom_xml2tree.c4
-rw-r--r--lib/libgeom/libgeom.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c
index 277dda6..6c8d738 100644
--- a/lib/libgeom/geom_xml2tree.c
+++ b/lib/libgeom/geom_xml2tree.c
@@ -217,7 +217,7 @@ EndElement(void *userData, const char *name)
}
if (p != NULL) {
-printf("<<<%s>>>\n", p);
+ printf("Unexpected XML: name=%s data=\"%s\"\n", name, p);
free(p);
}
@@ -267,7 +267,7 @@ CharData(void *userData , const XML_Char *s , int len)
}
struct gident *
-geom_lookupid(struct gmesh *gmp, void *id)
+geom_lookupid(struct gmesh *gmp, const void *id)
{
struct gident *gip;
diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h
index 130ac36..524194e 100644
--- a/lib/libgeom/libgeom.h
+++ b/lib/libgeom/libgeom.h
@@ -121,7 +121,7 @@ struct gprovider {
struct gconf config;
};
-struct gident * geom_lookupid(struct gmesh *gmp, void *id);
+struct gident * geom_lookupid(struct gmesh *gmp, const void *id);
int geom_xml2tree(struct gmesh *gmp, char *p);
int geom_gettree(struct gmesh *gmp);
void geom_deletetree(struct gmesh *gmp);
OpenPOWER on IntegriCloud