Changeset: 31c2c22c9b63 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31c2c22c9b63
Modified Files:
        clients/Tests/exports.stable.out
        gdk/gdk_tracer.c
        gdk/gdk_tracer.h
Branch: Jun2020
Log Message:

GDKtracer_log does not return a useful value.


diffs (62 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -302,7 +302,7 @@ str GDKstrdup(const char *s) __attribute
 str GDKstrndup(const char *s, size_t n) 
__attribute__((__warn_unused_result__));
 gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT *log_level);
 gdk_return GDKtracer_flush_buffer(void);
-gdk_return GDKtracer_log(const char *file, const char *func, int lineno, 
log_level_t lvl, component_t comp, const char *syserr, _In_z_ 
_Printf_format_string_ const char *format, ...) 
__attribute__((__format__(__printf__, 7, 8)));
+void GDKtracer_log(const char *file, const char *func, int lineno, log_level_t 
lvl, component_t comp, const char *syserr, _In_z_ _Printf_format_string_ const 
char *format, ...) __attribute__((__format__(__printf__, 7, 8)));
 void GDKtracer_reinit_basic(int sig);
 gdk_return GDKtracer_reset_adapter(void);
 gdk_return GDKtracer_reset_component_level(const char *comp);
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -391,7 +391,7 @@ GDKtracer_reset_adapter(void)
 }
 
 
-gdk_return
+void
 GDKtracer_log(const char *file, const char *func, int lineno,
              log_level_t level, component_t comp,
              const char *syserr,
@@ -427,7 +427,7 @@ GDKtracer_log(const char *file, const ch
        va_end(va);
        if (bytes_written < 0) {
                GDK_TRACER_EXCEPTION(GDKTRACER_FAILED "\n");
-               return GDK_FAIL;
+               return;
        }
        char *p;
        if ((p = strchr(buffer, '\n')) != NULL)
@@ -469,8 +469,6 @@ GDKtracer_log(const char *file, const ch
                                 syserr ? syserr : "");
                }
        }
-
-       return GDK_SUCCEED;
 }
 
 
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -258,11 +258,11 @@ gdk_export gdk_return GDKtracer_set_adap
 gdk_export gdk_return GDKtracer_reset_adapter(void);
 
 
-gdk_export gdk_return GDKtracer_log(const char *file, const char *func,
-                                   int lineno, log_level_t lvl,
-                                   component_t comp,
-                                   const char *syserr,
-                                   _In_z_ _Printf_format_string_ const char 
*format, ...)
+gdk_export void GDKtracer_log(const char *file, const char *func,
+                             int lineno, log_level_t lvl,
+                             component_t comp,
+                             const char *syserr,
+                             _In_z_ _Printf_format_string_ const char *format, 
...)
        __attribute__((__format__(__printf__, 7, 8)));
 
 
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to