X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=log.c;h=721258e1b1e951b74593d217046c7217b10d0c3a;hb=e51475add18d4a6ee4e30c4c5891b6de64c7c148;hp=d9030c298bfe8696e2f3dc654a2c7731bfac24ff;hpb=9fb7e7fe2c7edafdeedf1976d1723ffe557c8a7c;p=libsigrokdecode.git
diff --git a/log.c b/log.c
index d9030c2..721258e 100644
--- a/log.c
+++ b/log.c
@@ -14,14 +14,15 @@
* 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
#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
#include "libsigrokdecode.h"
#include
#include
+#include
/**
* @file
@@ -152,8 +153,6 @@ 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;
@@ -161,11 +160,12 @@ static int srd_logv(void *cb_data, int loglevel, const char *format,
if (loglevel > cur_loglevel)
return SRD_OK;
- 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;
+ return SRD_OK;
}
/** @private */
@@ -181,69 +181,4 @@ SRD_PRIV int srd_log(int loglevel, const char *format, ...)
return ret;
}
-/** @private */
-SRD_PRIV int srd_spew(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_cb(srd_log_cb_data, SRD_LOG_SPEW, format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_dbg(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_cb(srd_log_cb_data, SRD_LOG_DBG, format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_info(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_cb(srd_log_cb_data, SRD_LOG_INFO, format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_warn(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_cb(srd_log_cb_data, SRD_LOG_WARN, format, args);
- va_end(args);
-
- return ret;
-}
-
-/** @private */
-SRD_PRIV int srd_err(const char *format, ...)
-{
- int ret;
- va_list args;
-
- va_start(args, format);
- ret = srd_log_cb(srd_log_cb_data, SRD_LOG_ERR, format, args);
- va_end(args);
-
- return ret;
-}
-
/** @} */