提交 37ae2d59 编写于 作者: A Arnaud Lacombe 提交者: 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: NReinhard Tartler <Reinhard.Tartler@informatik.uni-erlangen.de>
Signed-off-by: NArnaud Lacombe <lacombar@gmail.com>
Signed-off-by: NJean Sacren <sakiwit@gmail.com>
Signed-off-by: NMichal Marek <mmarek@suse.cz>
上级 e2aef4d3
......@@ -10,6 +10,7 @@
extern "C" {
#endif
#include <assert.h>
#include <stdio.h>
#ifndef __cplusplus
#include <stdbool.h>
......
......@@ -90,8 +90,10 @@ struct conf_printer {
/* confdata.c and expr.c */
static inline void xfwrite(const void *str, size_t len, size_t count, FILE *out)
{
if (fwrite(str, len, count, out) < count)
fprintf(stderr, "\nError in writing or end of file.\n");
assert(len != 0);
if (fwrite(str, len, count, out) != count)
fprintf(stderr, "Error in writing or end of file.\n");
}
/* menu.c */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册