1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
From 601e6e56f44b91d957bb643662455f52540f336a Mon Sep 17 00:00:00 2001
From: Corey Minyard <cminyard@mvista.com>
Date: Tue, 25 Feb 2020 16:08:40 -0600
Subject: [PATCH] filter: Rename some variables to tr_stdxxx
stdout and stderr can be macros, don't use the names directly.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Upstream-Status: Backport [https://github.com/cminyard/gensio/commit/601e6e56f44b91d957bb643662455f52540f336a]
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
---
lib/gensio_filter_trace.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/lib/gensio_filter_trace.c b/lib/gensio_filter_trace.c
index d39d58b..abe2db6 100644
--- a/lib/gensio_filter_trace.c
+++ b/lib/gensio_filter_trace.c
@@ -32,8 +32,8 @@ struct trace_filter {
enum trace_dir dir;
bool raw;
char *filename;
- bool stdout;
- bool stderr;
+ bool tr_stdout;
+ bool tr_stderr;
FILE *tr;
};
@@ -82,9 +82,9 @@ trace_try_connect(struct gensio_filter *filter, struct timeval *timeout)
{
struct trace_filter *tfilter = filter_to_trace(filter);
- if (tfilter->stdout) {
+ if (tfilter->tr_stdout) {
tfilter->tr = stdout;
- } else if (tfilter->stderr) {
+ } else if (tfilter->tr_stderr) {
tfilter->tr = stderr;
} else if (tfilter->filename) {
tfilter->tr = fopen(tfilter->filename, "a+");
@@ -99,7 +99,7 @@ trace_try_disconnect(struct gensio_filter *filter, struct timeval *timeout)
{
struct trace_filter *tfilter = filter_to_trace(filter);
- if (!tfilter->stdout && !tfilter->stderr && tfilter->tr)
+ if (!tfilter->tr_stdout && !tfilter->tr_stderr && tfilter->tr)
fclose(tfilter->tr);
tfilter->tr = NULL;
return 0;
@@ -331,12 +331,12 @@ static int gensio_trace_filter_func(struct gensio_filter *filter, int op,
static struct gensio_filter *
gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir,
- bool raw, const char *filename, bool stdout,
- bool stderr)
+ bool raw, const char *filename, bool tr_stdout,
+ bool tr_stderr)
{
struct trace_filter *tfilter;
- if (!filename && !stdout && !stderr)
+ if (!filename && !tr_stdout && !tr_stderr)
dir = TRACE_NONE;
tfilter = o->zalloc(o, sizeof(*tfilter));
@@ -351,8 +351,8 @@ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir,
if (!tfilter->filename)
goto out_nomem;
}
- tfilter->stdout = stdout;
- tfilter->stderr = stderr;
+ tfilter->tr_stdout = tr_stdout;
+ tfilter->tr_stderr = tr_stderr;
tfilter->lock = o->alloc_lock(o);
if (!tfilter->lock)
@@ -385,7 +385,7 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o,
{
struct gensio_filter *filter;
int dir = TRACE_NONE;
- bool raw = false, stdout = false, stderr = false;
+ bool raw = false, tr_stdout = false, tr_stderr = false;
const char *filename = NULL;
unsigned int i;
@@ -396,15 +396,15 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o,
continue;
if (gensio_check_keyvalue(args[i], "file", &filename) > 0)
continue;
- if (gensio_check_keybool(args[i], "stdout", &stdout) > 0)
+ if (gensio_check_keybool(args[i], "stdout", &tr_stdout) > 0)
continue;
- if (gensio_check_keybool(args[i], "stderr", &stderr) > 0)
+ if (gensio_check_keybool(args[i], "stderr", &tr_stderr) > 0)
continue;
return GE_INVAL;
}
filter = gensio_trace_filter_raw_alloc(o, dir, raw, filename,
- stdout, stderr);
+ tr_stdout, tr_stderr);
if (!filter)
return GE_NOMEM;
--
2.7.4
|
