bugfix for print names in the C runtime and expose the functionality from Java

2 files changed, 2 insertions, 4 deletions

diff --git a/src/runtime/c/pgf/pgf.c b/src/runtime/c/pgf/pgf.c
index 6bc78b194..a8c6bb800 100644
--- a/src/runtime/c/pgf/pgf.c
+++ b/src/runtime/c/pgf/pgf.c
@@ -191,9 +191,7 @@ PGF_API GuString
 pgf_print_name(PgfConcr* concr, PgfCId id)
 {
 	PgfCId name =
-		gu_map_get(concr->printnames, id, PgfCId);
-	if (*name == 0)
-		name = id;
+		gu_map_get(concr->printnames, id, GuString);
 	return name;
 }
 
diff --git a/src/runtime/c/pgf/reader.c b/src/runtime/c/pgf/reader.c
index 935fa61b0..2129269e8 100644
--- a/src/runtime/c/pgf/reader.c
+++ b/src/runtime/c/pgf/reader.c
@@ -565,7 +565,7 @@ pgf_read_abstract(PgfReader* rdr, PgfAbstr* abstract)
 static PgfCIdMap*
 pgf_read_printnames(PgfReader* rdr)
 {
-	PgfCIdMap* printnames = gu_new_string_map(GuString, &"", rdr->opool);
+	PgfCIdMap* printnames = gu_new_string_map(GuString, &gu_null_struct, rdr->opool);
 
 	size_t len = pgf_read_len(rdr);
 	gu_return_on_exn(rdr->err, NULL);