license: remove FSF postal address from boiler plate license text

[libsigrokdecode.git] / log.c

diff --git a/log.c b/log.c
index 73c1fdde89bca9acb797fda11500f27e913e1405..721258e1b1e951b74593d217046c7217b10d0c3a 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -23,6 +22,7 @@
 #include "libsigrokdecode.h"
 #include <stdarg.h>
 #include <stdio.h>
+#include <glib/gprintf.h>
 
 /**
  * @file
@@ -153,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;
 
@@ -162,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 */