c843adc279
sysfsutils: backport upstream bugfix patches Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
44 lines
1.1 KiB
Diff
44 lines
1.1 KiB
Diff
From 049f2664ce29bd11c07894bbdef51b8d610b1d12 Mon Sep 17 00:00:00 2001
|
|
From: Lee Duncan <lduncan@suse.com>
|
|
Date: Wed, 24 Jun 2020 11:07:53 -0700
|
|
Subject: [PATCH 7/9] Fix compiler complain about multiple defs of my_stdout.
|
|
|
|
A simple fix: define it in one place, refer to it
|
|
elsewhere.
|
|
|
|
Signed-off-by: Lee Duncan <lduncan@suse.com>
|
|
---
|
|
test/test-defs.h | 2 +-
|
|
test/test.c | 2 ++
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/test/test-defs.h b/test/test-defs.h
|
|
index 28af1a5..3378373 100644
|
|
--- a/test/test-defs.h
|
|
+++ b/test/test-defs.h
|
|
@@ -42,7 +42,7 @@
|
|
#define inval_path "/sys/invalid/path"
|
|
#define FUNC_TABLE_SIZE (sizeof(func_table) / sizeof(void *))
|
|
|
|
-FILE *my_stdout;
|
|
+extern FILE *my_stdout;
|
|
|
|
#define dbg_print(format, arg...) fprintf(my_stdout, format, ## arg)
|
|
|
|
diff --git a/test/test.c b/test/test.c
|
|
index 2e8f201..f63e346 100644
|
|
--- a/test/test.c
|
|
+++ b/test/test.c
|
|
@@ -27,6 +27,8 @@
|
|
#include "test-defs.h"
|
|
#include <errno.h>
|
|
|
|
+FILE *my_stdout;
|
|
+
|
|
/*************************************************/
|
|
char *function_name[] = {
|
|
"sysfs_get_mnt_path",
|
|
--
|
|
1.8.3.1
|
|
|