Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 1 | From af89f36fbeb5f6a078b349eed8fc4ad6fbfdf5d1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 16 Jan 2023 15:26:12 -0800 |
| 4 | Subject: [PATCH] Drop using register keyword |
| 5 | |
| 6 | Its gone since c++17 |
| 7 | |
| 8 | Fixes |
| 9 | error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] |
| 10 | | register char c; |
| 11 | | ^~~~~~~~~ |
| 12 | |
| 13 | Upstream-Status: Pending |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | telnet/commands.cc | 14 +++++++------- |
| 17 | telnet/defines.h | 1 + |
| 18 | telnet/sys_bsd.cc | 2 +- |
| 19 | telnet/telnet.cc | 18 +++++++++--------- |
| 20 | telnet/terminal.cc | 4 ++-- |
| 21 | telnet/tn3270.cc | 4 ++-- |
| 22 | telnet/tn3270.o | Bin 4008 -> 4008 bytes |
| 23 | telnet/utilities.cc | 6 +++--- |
| 24 | telnetd/setproctitle.c | 6 +++--- |
| 25 | telnetd/slc.c | 4 ++-- |
| 26 | telnetd/state.c | 12 ++++++------ |
| 27 | telnetd/sys_term.c | 4 ++-- |
| 28 | telnetd/telnetd.c | 4 ++-- |
| 29 | telnetd/termstat.c | 4 ++-- |
| 30 | telnetd/utility.c | 16 ++++++++-------- |
| 31 | 15 files changed, 50 insertions(+), 49 deletions(-) |
| 32 | |
| 33 | --- a/telnet/commands.cc |
| 34 | +++ b/telnet/commands.cc |
| 35 | @@ -192,8 +192,8 @@ static int margc; |
| 36 | static const char *margv[20]; |
| 37 | |
| 38 | static void makeargv(void) { |
| 39 | - register char *cp, *cp2, c; |
| 40 | - register const char **argp = margv; |
| 41 | + char *cp, *cp2, c; |
| 42 | + const char **argp = margv; |
| 43 | |
| 44 | margc = 0; |
| 45 | cp = line; |
| 46 | @@ -204,7 +204,7 @@ static void makeargv(void) { |
| 47 | cp++; |
| 48 | } |
| 49 | while ((c = *cp)!=0) { |
| 50 | - register int inquote = 0; |
| 51 | + int inquote = 0; |
| 52 | while (isspace(c)) |
| 53 | c = *++cp; |
| 54 | if (c == '\0') |
| 55 | @@ -281,7 +281,7 @@ static const char *control(cc_t c) |
| 56 | * was to assign "c" to an unsigned int variable... |
| 57 | * Arggg.... |
| 58 | */ |
| 59 | - register unsigned int uic = (unsigned int)c; |
| 60 | + unsigned int uic = (unsigned int)c; |
| 61 | |
| 62 | if (uic == 0x7f) |
| 63 | return ("^?"); |
| 64 | @@ -479,7 +479,7 @@ int send_tncmd(int (*func)(int, int), co |
| 65 | long opt; |
| 66 | |
| 67 | if (isprefix(name, "help") || isprefix(name, "?")) { |
| 68 | - register int col, len; |
| 69 | + int col, len; |
| 70 | |
| 71 | printf("Usage: send %s <option>\n", cmd); |
| 72 | printf("Valid options are:\n\t"); |
| 73 | @@ -2212,8 +2212,8 @@ static unsigned long sourceroute(char *a |
| 74 | static char lsr[44]; |
| 75 | char *cp, *cp2, *lsrp, *lsrep; |
| 76 | struct in_addr sin_addr; |
| 77 | - register struct hostent *host = 0; |
| 78 | - register char c; |
| 79 | + struct hostent *host = 0; |
| 80 | + char c; |
| 81 | |
| 82 | /* |
| 83 | * Verify the arguments, and make sure we have |
| 84 | --- a/telnet/defines.h |
| 85 | +++ b/telnet/defines.h |
| 86 | @@ -52,3 +52,4 @@ |
| 87 | #define CONTROL(x) ((x)&0x1f) /* CTRL(x) is not portable */ |
| 88 | |
| 89 | #define MODE_OUT8 0x8000 /* binary mode sans -opost */ |
| 90 | + |
| 91 | --- a/telnet/sys_bsd.cc |
| 92 | +++ b/telnet/sys_bsd.cc |
| 93 | @@ -285,7 +285,7 @@ void sys_telnet_init(void) { |
| 94 | int process_rings(int netin, int netout, int netex, int ttyin, int ttyout, |
| 95 | int poll /* If 0, then block until something to do */) |
| 96 | { |
| 97 | - register int c, maxfd; |
| 98 | + int c, maxfd; |
| 99 | /* One wants to be a bit careful about setting returnValue |
| 100 | * to one, since a one implies we did some useful work, |
| 101 | * and therefore probably won't be called to block next |
| 102 | --- a/telnet/telnet.cc |
| 103 | +++ b/telnet/telnet.cc |
| 104 | @@ -864,7 +864,7 @@ struct spc { |
| 105 | static int slc_mode = SLC_EXPORT; |
| 106 | |
| 107 | void slc_init(void) { |
| 108 | - register struct spc *spcp; |
| 109 | + struct spc *spcp; |
| 110 | |
| 111 | localchars = 1; |
| 112 | for (spcp = spc_data; spcp < &spc_data[NSLC+1]; spcp++) { |
| 113 | @@ -944,7 +944,7 @@ void slc_import(int def) { |
| 114 | } |
| 115 | |
| 116 | void slc_export(void) { |
| 117 | - register struct spc *spcp; |
| 118 | + struct spc *spcp; |
| 119 | |
| 120 | TerminalDefaultChars(); |
| 121 | |
| 122 | @@ -966,8 +966,8 @@ void slc_export(void) { |
| 123 | } |
| 124 | |
| 125 | void slc(unsigned char *cp, int len) { |
| 126 | - register struct spc *spcp; |
| 127 | - register int func,level; |
| 128 | + struct spc *spcp; |
| 129 | + int func,level; |
| 130 | |
| 131 | slc_start_reply(); |
| 132 | |
| 133 | @@ -1032,7 +1032,7 @@ void slc(unsigned char *cp, int len) { |
| 134 | } |
| 135 | |
| 136 | void slc_check(void) { |
| 137 | - register struct spc *spcp; |
| 138 | + struct spc *spcp; |
| 139 | |
| 140 | slc_start_reply(); |
| 141 | for (spcp = &spc_data[1]; spcp < &spc_data[NSLC+1]; spcp++) { |
| 142 | @@ -1080,7 +1080,7 @@ void slc_add_reply(int func, int flags, |
| 143 | } |
| 144 | |
| 145 | void slc_end_reply(void) { |
| 146 | - register int len; |
| 147 | + int len; |
| 148 | |
| 149 | *slc_replyp++ = IAC; |
| 150 | *slc_replyp++ = SE; |
| 151 | @@ -1200,7 +1200,7 @@ void env_opt_add(const char *ep) { |
| 152 | tp = opt_replyp + (vp ? strlen(vp) * 2 : 0) + strlen(ep) * 2 + 6; |
| 153 | if (tp > opt_replyend) |
| 154 | { |
| 155 | - register int len; |
| 156 | + int len; |
| 157 | len = ((tp - opt_reply) + OPT_REPLY_SIZE - 1) & ~(OPT_REPLY_SIZE - 1); |
| 158 | opt_replyend = opt_reply + len; |
| 159 | opt_reply = (unsigned char *)realloc(opt_reply, len); |
| 160 | @@ -1236,7 +1236,7 @@ void env_opt_add(const char *ep) { |
| 161 | } |
| 162 | |
| 163 | void env_opt_end(int emptyok) { |
| 164 | - register int len; |
| 165 | + int len; |
| 166 | |
| 167 | len = opt_replyp - opt_reply + 2; |
| 168 | if (emptyok || len > 6) { |
| 169 | @@ -1874,7 +1874,7 @@ static unsigned char *nextitem(unsigned |
| 170 | |
| 171 | static void netclear(void) { |
| 172 | #if 0 /* XXX */ |
| 173 | - register char *thisitem, *next; |
| 174 | + char *thisitem, *next; |
| 175 | char *good; |
| 176 | #define wewant(p) ((nfrontp > p) && (*p == IAC) && \ |
| 177 | (p[1] != EC) && (p[1] != EL)) |
| 178 | --- a/telnet/terminal.cc |
| 179 | +++ b/telnet/terminal.cc |
| 180 | @@ -569,8 +569,8 @@ struct termspeeds { |
| 181 | }; |
| 182 | |
| 183 | void TerminalSpeeds(long *ispeed, long *ospeed) { |
| 184 | - register struct termspeeds *tp; |
| 185 | - register long in, out; |
| 186 | + struct termspeeds *tp; |
| 187 | + long in, out; |
| 188 | |
| 189 | out = cfgetospeed(&old_tc); |
| 190 | in = cfgetispeed(&old_tc); |
| 191 | --- a/telnet/tn3270.cc |
| 192 | +++ b/telnet/tn3270.cc |
| 193 | @@ -103,7 +103,7 @@ void init_3270(void) { |
| 194 | * done: is this the last of a logical block |
| 195 | */ |
| 196 | int DataToNetwork(char *buffer, int count, int done) { |
| 197 | - register int loop, c; |
| 198 | + int loop, c; |
| 199 | int origCount; |
| 200 | |
| 201 | origCount = count; |
| 202 | @@ -179,7 +179,7 @@ void outputPurge(void) { |
| 203 | * count: how much to send |
| 204 | */ |
| 205 | int DataToTerminal(char *buffer, int count) { |
| 206 | - register int c; |
| 207 | + int c; |
| 208 | int origCount; |
| 209 | |
| 210 | origCount = count; |
| 211 | --- a/telnet/utilities.cc |
| 212 | +++ b/telnet/utilities.cc |
| 213 | @@ -252,7 +252,7 @@ void optionstatus(void) { |
| 214 | /* pointer: where suboption data sits */ |
| 215 | /* length: length of suboption data */ |
| 216 | void printsub(int direction, unsigned char *pointer, int length) { |
| 217 | - register int i = 0; |
| 218 | + int i = 0; |
| 219 | |
| 220 | extern int want_status_response; |
| 221 | |
| 222 | @@ -262,7 +262,7 @@ void printsub(int direction, unsigned ch |
| 223 | fprintf(NetTrace, "%s IAC SB ", |
| 224 | (direction == '<')? "RCVD":"SENT"); |
| 225 | if (length >= 3) { |
| 226 | - register int j; |
| 227 | + int j; |
| 228 | |
| 229 | i = pointer[length-2]; |
| 230 | j = pointer[length-1]; |
| 231 | @@ -577,7 +577,7 @@ void printsub(int direction, unsigned ch |
| 232 | fprintf(NetTrace, "INFO "); |
| 233 | env_common: |
| 234 | { |
| 235 | - register int noquote = 2; |
| 236 | + int noquote = 2; |
| 237 | for (i = 2; i < length; i++ ) { |
| 238 | switch (pointer[i]) { |
| 239 | case ENV_VAR: |
| 240 | --- a/telnetd/setproctitle.c |
| 241 | +++ b/telnetd/setproctitle.c |
| 242 | @@ -76,7 +76,7 @@ static char Argv0[128]; /* program nam |
| 243 | void |
| 244 | initsetproctitle(int argc, char **argv, char **envp) |
| 245 | { |
| 246 | - register int i; |
| 247 | + int i; |
| 248 | char *tmp; |
| 249 | |
| 250 | /* |
| 251 | @@ -111,8 +111,8 @@ initsetproctitle(int argc, char **argv, |
| 252 | void |
| 253 | setproctitle(const char *fmt, ...) |
| 254 | { |
| 255 | - register char *p; |
| 256 | - register int i=0; |
| 257 | + char *p; |
| 258 | + int i=0; |
| 259 | static char buf[2048]; |
| 260 | va_list ap; |
| 261 | |
| 262 | --- a/telnetd/slc.c |
| 263 | +++ b/telnetd/slc.c |
| 264 | @@ -196,7 +196,7 @@ int end_slc(unsigned char **bufp) { |
| 265 | * Figure out what to do about the client's slc |
| 266 | */ |
| 267 | void process_slc(unsigned char func, unsigned char flag, cc_t val) { |
| 268 | - register int hislevel, mylevel, ack; |
| 269 | + int hislevel, mylevel, ack; |
| 270 | |
| 271 | /* |
| 272 | * Ensure that we know something about this function |
| 273 | @@ -260,7 +260,7 @@ void process_slc(unsigned char func, uns |
| 274 | * Compare client's request with what we are capable of supporting. |
| 275 | */ |
| 276 | void change_slc(char func, char flag, cc_t val) { |
| 277 | - register int hislevel, mylevel; |
| 278 | + int hislevel, mylevel; |
| 279 | |
| 280 | hislevel = flag & SLC_LEVELBITS; |
| 281 | mylevel = slctab[func].defset.flag & SLC_LEVELBITS; |
| 282 | --- a/telnetd/state.c |
| 283 | +++ b/telnetd/state.c |
| 284 | @@ -79,7 +79,7 @@ unsigned char subbuffer[512], *subpointe |
| 285 | #define TS_DONT 8 /* dont " */ |
| 286 | |
| 287 | void telrcv(void) { |
| 288 | - register int c; |
| 289 | + int c; |
| 290 | static int state = TS_DATA; |
| 291 | |
| 292 | while (ncc > 0) { |
| 293 | @@ -1081,7 +1081,7 @@ void suboption(void) { |
| 294 | |
| 295 | #ifdef LINEMODE |
| 296 | case TELOPT_LINEMODE: { |
| 297 | - register int request; |
| 298 | + int request; |
| 299 | |
| 300 | if (his_state_is_wont(TELOPT_LINEMODE)) /* Ignore if option disabled */ |
| 301 | break; |
| 302 | @@ -1158,8 +1158,8 @@ void suboption(void) { |
| 303 | } /* end of case TELOPT_XDISPLOC */ |
| 304 | |
| 305 | case TELOPT_ENVIRON: { |
| 306 | - register int c; |
| 307 | - register char *cp, *varp, *valp; |
| 308 | + int c; |
| 309 | + char *cp, *varp, *valp; |
| 310 | |
| 311 | if (SB_EOF()) |
| 312 | return; |
| 313 | @@ -1299,8 +1299,8 @@ static void doclientstat(void) { |
| 314 | |
| 315 | void send_status(void) { |
| 316 | unsigned char statusbuf[256]; |
| 317 | - register unsigned char *ncp; |
| 318 | - register unsigned char i; |
| 319 | + unsigned char *ncp; |
| 320 | + unsigned char i; |
| 321 | |
| 322 | ncp = statusbuf; |
| 323 | |
| 324 | --- a/telnetd/sys_term.c |
| 325 | +++ b/telnetd/sys_term.c |
| 326 | @@ -413,7 +413,7 @@ extern int def_tspeed, def_rspeed; |
| 327 | |
| 328 | static int getptyslave(void) { |
| 329 | #if 0 |
| 330 | - register int t = -1; |
| 331 | + int t = -1; |
| 332 | |
| 333 | # ifdef LINEMODE |
| 334 | int waslm; |
| 335 | @@ -505,7 +505,7 @@ static int getptyslave(void) { |
| 336 | * making sure that we have a clean tty. |
| 337 | */ |
| 338 | static int cleanopen(char *lyne) { |
| 339 | - register int t; |
| 340 | + int t; |
| 341 | |
| 342 | /* |
| 343 | * Make sure that other people can't open the |
| 344 | --- a/telnetd/telnetd.c |
| 345 | +++ b/telnetd/telnetd.c |
| 346 | @@ -93,7 +93,7 @@ main(int argc, char *argv[], char *env[] |
| 347 | struct sockaddr_in from; |
| 348 | int on = 1; |
| 349 | socklen_t fromlen; |
| 350 | - register int ch; |
| 351 | + int ch; |
| 352 | |
| 353 | #if defined(HAS_IPPROTO_IP) && defined(IP_TOS) |
| 354 | int tos = -1; |
| 355 | @@ -837,7 +837,7 @@ void telnet(int f, int p) |
| 356 | |
| 357 | #ifdef TIOCNOTTY |
| 358 | { |
| 359 | - register int t; |
| 360 | + int t; |
| 361 | t = open(_PATH_TTY, O_RDWR); |
| 362 | if (t >= 0) { |
| 363 | (void) ioctl(t, TIOCNOTTY, (char *)0); |
| 364 | --- a/telnetd/termstat.c |
| 365 | +++ b/telnetd/termstat.c |
| 366 | @@ -347,7 +347,7 @@ done: |
| 367 | * at a time, and if using kludge linemode, then only linemode may be |
| 368 | * affected. |
| 369 | */ |
| 370 | -void clientstat(register int code, register int parm1, register int parm2) |
| 371 | +void clientstat(int code, register int parm1, register int parm2) |
| 372 | { |
| 373 | /* |
| 374 | * Get a copy of terminal characteristics. |
| 375 | @@ -419,7 +419,7 @@ void clientstat(register int code, regis |
| 376 | |
| 377 | case LM_MODE: |
| 378 | { |
| 379 | - register int ack, changed; |
| 380 | + int ack, changed; |
| 381 | |
| 382 | /* |
| 383 | * Client has sent along a mode mask. If it agrees with |
| 384 | --- a/telnetd/utility.c |
| 385 | +++ b/telnetd/utility.c |
| 386 | @@ -189,7 +189,7 @@ nextitem(char *current, const char *endp |
| 387 | return current+3 <= endp ? current+3 : NULL; |
| 388 | case SB: /* loop forever looking for the SE */ |
| 389 | { |
| 390 | - register char *look = current+2; |
| 391 | + char *look = current+2; |
| 392 | |
| 393 | while (look < endp) { |
| 394 | if ((*look++&0xff) == IAC) { |
| 395 | @@ -224,7 +224,7 @@ nextitem(char *current, const char *endp |
| 396 | */ |
| 397 | void netclear(void) |
| 398 | { |
| 399 | - register char *thisitem, *next; |
| 400 | + char *thisitem, *next; |
| 401 | char *good; |
| 402 | #define wewant(p) ((nfrontp > p) && ((*p&0xff) == IAC) && \ |
| 403 | (nfrontp > p+1 && (((*(p+1)&0xff) != EC) && ((*(p+1)&0xff) != EL)))) |
| 404 | @@ -354,7 +354,7 @@ netflush(void) |
| 405 | * ptr - A pointer to a character string to write |
| 406 | * len - How many bytes to write |
| 407 | */ |
| 408 | -void writenet(register unsigned char *ptr, register int len) |
| 409 | +void writenet(unsigned char *ptr, register int len) |
| 410 | { |
| 411 | /* flush buffer if no room for new data) */ |
| 412 | if ((&netobuf[BUFSIZ] - nfrontp) < len) { |
| 413 | @@ -589,7 +589,7 @@ printoption(const char *fmt, int option) |
| 414 | void |
| 415 | printsub(char direction, unsigned char *pointer, int length) |
| 416 | { |
| 417 | - register int i = -1; |
| 418 | + int i = -1; |
| 419 | #ifdef AUTHENTICATE |
| 420 | char buf[512]; |
| 421 | #endif |
| 422 | @@ -601,7 +601,7 @@ printsub(char direction, unsigned char * |
| 423 | netoprintf("td: %s suboption ", |
| 424 | direction == '<' ? "recv" : "send"); |
| 425 | if (length >= 3) { |
| 426 | - register int j; |
| 427 | + int j; |
| 428 | |
| 429 | i = pointer[length-2]; |
| 430 | j = pointer[length-1]; |
| 431 | @@ -817,7 +817,7 @@ printsub(char direction, unsigned char * |
| 432 | |
| 433 | case TELOPT_STATUS: { |
| 434 | const char *cp; |
| 435 | - register int j, k; |
| 436 | + int j, k; |
| 437 | |
| 438 | netoprintf("STATUS"); |
| 439 | |
| 440 | @@ -914,7 +914,7 @@ printsub(char direction, unsigned char * |
| 441 | netoprintf("INFO "); |
| 442 | env_common: |
| 443 | { |
| 444 | - register int noquote = 2; |
| 445 | + int noquote = 2; |
| 446 | for (i = 2; i < length; i++ ) { |
| 447 | switch (pointer[i]) { |
| 448 | case ENV_VAR: |
| 449 | @@ -1125,7 +1125,7 @@ printsub(char direction, unsigned char * |
| 450 | void |
| 451 | printdata(const char *tag, const char *ptr, int cnt) |
| 452 | { |
| 453 | - register int i; |
| 454 | + int i; |
| 455 | char xbuf[30]; |
| 456 | |
| 457 | while (cnt) { |