hwdriver.c: Fix two scan-build warnings.

[libsigrok.git] / src / log.c

diff --git a/src/log.c b/src/log.c
index 3cbbe17be537d2776c207f2de5a6f65327a70c36..caffa2a2d4900f8532b82455288a748aea6b4ba7 100644 (file)
--- a/src/log.c
+++ b/src/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>
@@ -25,7 +24,9 @@
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
+/** @cond PRIVATE */
 #define LOG_PREFIX "log"
+/** @endcond */
 
 /**
  * @file
@@ -169,9 +170,7 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
        /* 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 SR_OK;
+       (void)loglevel;
 
        if (cur_loglevel >= LOGLEVEL_TIMESTAMP) {
                elapsed_us = g_get_monotonic_time() - sr_log_start_time;
@@ -203,6 +202,7 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
        }
 
        g_fprintf(stderr, "%s\n", output);
+       fflush(stderr);
        g_free(raw_output);
        g_free(output);
 
@@ -215,6 +215,10 @@ SR_PRIV int sr_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 SR_OK;
+
        va_start(args, format);
        ret = sr_log_cb(sr_log_cb_data, loglevel, format, args);
        va_end(args);