Skip to content

Commit c173be2

Browse files
author
Uwe Kleine-König
committed
rename dprintf to dbg_printf
Apart from being more explicit about the purpose of this function this also stops hiding the libc function dprintf(3). Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
1 parent c25e6d4 commit c173be2

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

microcom.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ extern int current_flow;
118118
int do_commandline(void);
119119
int do_script(char *script);
120120

121-
#define dprintf(fmt,args...) ({ if (debug) printf (fmt ,##args); })
121+
#define dbg_printf(fmt,args...) ({ if (debug) printf(fmt ,##args); })
122122

123123
/* RFC2217 */
124124
#define COM_PORT_OPTION 44

mux.c

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -30,85 +30,85 @@ static int do_com_port_option(unsigned char *buf, int len)
3030
while (i < len) {
3131
switch (buf[i]) {
3232
case IAC:
33-
dprintf("IAC ");
33+
dbg_printf("IAC ");
3434
return i + 1;
3535
case SET_BAUDRATE_CS:
36-
dprintf("SET_BAUDRATE_CS ");
36+
dbg_printf("SET_BAUDRATE_CS ");
3737
break;
3838
case SET_DATASIZE_CS:
39-
dprintf("SET_DATASIZE_CS ");
39+
dbg_printf("SET_DATASIZE_CS ");
4040
break;
4141
case SET_PARITY_CS:
42-
dprintf("SET_PARITY_CS ");
42+
dbg_printf("SET_PARITY_CS ");
4343
break;
4444
case SET_STOPSIZE_CS:
45-
dprintf("SET_STOPSIZE_CS ");
45+
dbg_printf("SET_STOPSIZE_CS ");
4646
break;
4747
case SET_CONTROL_CS:
48-
dprintf("SET_CONTROL_CS ");
48+
dbg_printf("SET_CONTROL_CS ");
4949
break;
5050
case NOTIFY_LINESTATE_CS:
51-
dprintf("NOTIFY_LINESTATE_CS ");
51+
dbg_printf("NOTIFY_LINESTATE_CS ");
5252
break;
5353
case NOTIFY_MODEMSTATE_CS:
54-
dprintf("NOTIFY_MODEMSTATE_CS ");
54+
dbg_printf("NOTIFY_MODEMSTATE_CS ");
5555
break;
5656
case FLOWCONTROL_SUSPEND_CS:
57-
dprintf("FLOWCONTROL_SUSPEND_CS ");
57+
dbg_printf("FLOWCONTROL_SUSPEND_CS ");
5858
break;
5959
case FLOWCONTROL_RESUME_CS:
60-
dprintf("FLOWCONTROL_RESUME_CS ");
60+
dbg_printf("FLOWCONTROL_RESUME_CS ");
6161
break;
6262
case SET_LINESTATE_MASK_CS:
63-
dprintf("SET_LINESTATE_MASK_CS ");
63+
dbg_printf("SET_LINESTATE_MASK_CS ");
6464
break;
6565
case SET_MODEMSTATE_MASK_CS:
66-
dprintf("SET_MODEMSTATE_MASK_CS ");
66+
dbg_printf("SET_MODEMSTATE_MASK_CS ");
6767
break;
6868
case PURGE_DATA_CS:
69-
dprintf("PURGE_DATA_CS ");
69+
dbg_printf("PURGE_DATA_CS ");
7070
break;
7171
case SET_BAUDRATE_SC:
72-
dprintf("SET_BAUDRATE_SC %d ", ntohl(*(int *)&buf[i + 1]));
72+
dbg_printf("SET_BAUDRATE_SC %d ", ntohl(*(int *)&buf[i + 1]));
7373
i += 4;
7474
break;
7575
case SET_DATASIZE_SC:
76-
dprintf("SET_DATASIZE_SC ");
76+
dbg_printf("SET_DATASIZE_SC ");
7777
break;
7878
case SET_PARITY_SC:
79-
dprintf("SET_PARITY_SC ");
79+
dbg_printf("SET_PARITY_SC ");
8080
break;
8181
case SET_STOPSIZE_SC:
82-
dprintf("SET_STOPSIZE_SC ");
82+
dbg_printf("SET_STOPSIZE_SC ");
8383
break;
8484
case SET_CONTROL_SC:
8585
i++;
86-
dprintf("SET_CONTROL_SC 0x%02x ", buf[i]);
86+
dbg_printf("SET_CONTROL_SC 0x%02x ", buf[i]);
8787
break;
8888
case NOTIFY_LINESTATE_SC:
89-
dprintf("NOTIFY_LINESTATE_SC ");
89+
dbg_printf("NOTIFY_LINESTATE_SC ");
9090
break;
9191
case NOTIFY_MODEMSTATE_SC:
9292
i++;
93-
dprintf("NOTIFY_MODEMSTATE_SC 0x%02x ", buf[i]);
93+
dbg_printf("NOTIFY_MODEMSTATE_SC 0x%02x ", buf[i]);
9494
break;
9595
case FLOWCONTROL_SUSPEND_SC:
96-
dprintf("FLOWCONTROL_SUSPEND_SC ");
96+
dbg_printf("FLOWCONTROL_SUSPEND_SC ");
9797
break;
9898
case FLOWCONTROL_RESUME_SC:
99-
dprintf("FLOWCONTROL_RESUME_SC ");
99+
dbg_printf("FLOWCONTROL_RESUME_SC ");
100100
break;
101101
case SET_LINESTATE_MASK_SC:
102-
dprintf("SET_LINESTATE_MASK_SC ");
102+
dbg_printf("SET_LINESTATE_MASK_SC ");
103103
break;
104104
case SET_MODEMSTATE_MASK_SC:
105-
dprintf("SET_MODEMSTATE_MASK_SC ");
105+
dbg_printf("SET_MODEMSTATE_MASK_SC ");
106106
break;
107107
case PURGE_DATA_SC:
108-
dprintf("PURGE_DATA_SC ");
108+
dbg_printf("PURGE_DATA_SC ");
109109
break;
110110
default:
111-
dprintf("%d ", buf[i]);
111+
dbg_printf("%d ", buf[i]);
112112
break;
113113
}
114114
i++;
@@ -124,13 +124,13 @@ static int do_subneg(unsigned char *buf, int len)
124124
while (i < len) {
125125
switch (buf[i]) {
126126
case COM_PORT_OPTION:
127-
dprintf("COM_PORT_OPTION ");
127+
dbg_printf("COM_PORT_OPTION ");
128128
return do_com_port_option(&buf[i + 1], len - i) + 1;
129129
case IAC:
130-
dprintf("IAC ");
130+
dbg_printf("IAC ");
131131
return len - i;
132132
default:
133-
dprintf("%d ", buf[i]);
133+
dbg_printf("%d ", buf[i]);
134134
break;
135135
}
136136
i++;
@@ -146,38 +146,38 @@ static int handle_command(unsigned char *buf, int len)
146146
while (i < len) {
147147
switch (buf[i]) {
148148
case SB:
149-
dprintf("SB ");
149+
dbg_printf("SB ");
150150
i += do_subneg(&buf[i+1], len - i);
151151
break;
152152
case IAC:
153-
dprintf("IAC ");
153+
dbg_printf("IAC ");
154154
break;
155155
case COM_PORT_OPTION:
156-
dprintf("COM_PORT_OPTION ");
156+
dbg_printf("COM_PORT_OPTION ");
157157
break;
158158
case SE:
159-
dprintf("SE ");
159+
dbg_printf("SE ");
160160
break;
161161
case WILL:
162-
dprintf("WILL ");
162+
dbg_printf("WILL ");
163163
break;
164164
case WONT:
165-
dprintf("WONT ");
165+
dbg_printf("WONT ");
166166
break;
167167
case DO:
168-
dprintf("DO ");
168+
dbg_printf("DO ");
169169
break;
170170
case DONT:
171-
dprintf("DONT ");
171+
dbg_printf("DONT ");
172172
break;
173173
default:
174-
dprintf("%d ", buf[i]);
174+
dbg_printf("%d ", buf[i]);
175175
break;
176176
}
177177
i++;
178178
}
179179

180-
dprintf("\n");
180+
dbg_printf("\n");
181181
return len;
182182
}
183183

0 commit comments

Comments
 (0)