X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=log.c;h=459a5c10be9023ad2422a4c35a015abfd79f95ee;hb=287e2788a726732e5f29eb3f5f4fe9d68fac4d05;hp=73c1fdde89bca9acb797fda11500f27e913e1405;hpb=367843620d039ad183bc4d7c33d91c316d717621;p=libsigrokdecode.git
diff --git a/log.c b/log.c
index 73c1fdd..459a5c1 100644
--- a/log.c
+++ b/log.c
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -23,6 +22,7 @@
#include "libsigrokdecode.h"
#include
#include
+#include
/**
* @file
@@ -153,20 +153,19 @@ SRD_API int srd_log_callback_set_default(void)
static int srd_logv(void *cb_data, int loglevel, const char *format,
va_list args)
{
- int ret;
-
/* This specific log callback doesn't need the void pointer data. */
(void)cb_data;
- /* Only output messages of at least the selected loglevel(s). */
- if (loglevel > cur_loglevel)
- return SRD_OK;
+ (void)loglevel;
- fputs("srd: ", stderr);
- ret = vfprintf(stderr, format, args);
- fprintf(stderr, "\n");
+ if (fputs("srd: ", stderr) < 0
+ || g_vfprintf(stderr, format, args) < 0
+ || putc('\n', stderr) < 0)
+ return SRD_ERR;
- return ret;
+ fflush(stderr);
+
+ return SRD_OK;
}
/** @private */
@@ -175,6 +174,10 @@ SRD_PRIV int srd_log(int loglevel, const char *format, ...)
int ret;
va_list args;
+ /* Only output messages of at least the selected loglevel(s). */
+ if (loglevel > cur_loglevel)
+ return SRD_OK;
+
va_start(args, format);
ret = srd_log_cb(srd_log_cb_data, loglevel, format, args);
va_end(args);