From d4f14c52edc9f760eb711931c62a9c4013cd2e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Sat, 22 Jun 2019 14:04:11 +0200 Subject: [PATCH] Issue #19: Replace g_errors because these errors are not fatal --- command-line.c | 7 +++++-- output-renderers/external-renderer.c | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/command-line.c b/command-line.c index bd49f41..da4a570 100644 --- a/command-line.c +++ b/command-line.c @@ -101,8 +101,10 @@ static int create_renderers(char **renderers, } else if (!strcmp(current_renderer, "svg")) { output_renderer = GDS_RENDER_OUTPUT_RENDERER(cairo_renderer_new_svg()); } else if (!strcmp(current_renderer, "ext")) { - if (!so_path) + if (!so_path) { + fprintf(stderr, "Please specify shared object for external renderer. Will ignore this renderer.\n"); continue; + } output_renderer = GDS_RENDER_OUTPUT_RENDERER(external_renderer_new_with_so(so_path)); } else { continue; @@ -148,7 +150,8 @@ int command_line_convert_gds(const char *gds_name, layer_settings_load_from_csv(layer_sett, layer_file); /* Create renderers */ - if (create_renderers(renderers, output_file_names, tex_layers, tex_standalone, so_path, &renderer_list, layer_sett)) + if (create_renderers(renderers, output_file_names, tex_layers, tex_standalone, + so_path, &renderer_list, layer_sett)) goto ret_destroy_layer_mapping; diff --git a/output-renderers/external-renderer.c b/output-renderers/external-renderer.c index 1f1a694..ab752db 100644 --- a/output-renderers/external-renderer.c +++ b/output-renderers/external-renderer.c @@ -62,7 +62,7 @@ static int external_renderer_render_cell(struct gds_cell *toplevel_cell, GList * int ret = 0; if (!so_path) { - g_error("Path to shared object not set!"); + fprintf(stderr, "Path to shared object not set!\n"); return -3000; } @@ -73,7 +73,7 @@ static int external_renderer_render_cell(struct gds_cell *toplevel_cell, GList * /* Load shared object */ so_handle = dlopen(so_path, RTLD_LAZY); if (!so_handle) { - g_error("Could not load external library '%s'\nDetailed error is:\n%s", so_path, dlerror()); + fprintf(stderr, "Could not load external library '%s'\nDetailed error is:\n%s\n", so_path, dlerror()); return -2000; } @@ -81,7 +81,7 @@ static int external_renderer_render_cell(struct gds_cell *toplevel_cell, GList * so_render_func = (int (*)(struct gds_cell *, GList *, const char *, double))dlsym(so_handle, EXTERNAL_LIBRARY_FUNCTION); error_msg = dlerror(); if (error_msg != NULL) { - g_error("Rendering function not found in library:\n%s\n", error_msg); + fprintf(stderr, "Rendering function not found in library:\n%s\n", error_msg); goto ret_close_so_handle; }