Commit 37ae2d59 authored by Arnaud Lacombe's avatar Arnaud Lacombe Committed by Michal Marek

kbuild: Fix compiler warning with assertion when calling 'fwrite'

Reinhard Tartler discovered a corner case of calling xfwrite() where the
length of the string is zero.

Arnaud Lacombe suggested to use assertion for the corner case, as
fwrite(3) is currently used:

 1) in comment printers. Empty comment are not allowed.
 2) in a callback passed to expr_print(), where the string printed is
    either NULL OR non-empty.
 3) in the lexer, auto-generated, and unused.

I feel using assertion is a good solution:

 1) It cleanly takes care of the above-mentioned corner case.
 2) It can be easily disabled by defining NDEBUG.
 3) It asserts xfwrite() is simply a wrapper for fwrite().
Reported-by: default avatarReinhard Tartler <Reinhard.Tartler@informatik.uni-erlangen.de>
Signed-off-by: default avatarArnaud Lacombe <lacombar@gmail.com>
Signed-off-by: default avatarJean Sacren <sakiwit@gmail.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent e2aef4d3
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
extern "C" { extern "C" {
#endif #endif
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#ifndef __cplusplus #ifndef __cplusplus
#include <stdbool.h> #include <stdbool.h>
......
...@@ -90,8 +90,10 @@ struct conf_printer { ...@@ -90,8 +90,10 @@ struct conf_printer {
/* confdata.c and expr.c */ /* confdata.c and expr.c */
static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out) static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
{ {
if (fwrite(str, len, count, out) < count) assert(len != 0);
fprintf(stderr, "\nError in writing or end of file.\n");
if (fwrite(str, len, count, out) != count)
fprintf(stderr, "Error in writing or end of file.\n");
} }
/* menu.c */ /* menu.c */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment