X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_cmdline%2Fcmdline_socket.c;h=3fc243b709ed529828114489e26ac14adf87095a;hb=69736db1d80d365199b5be55591878c5542aaf33;hp=f287690d2368e05a9182b631029c05aca1549b99;hpb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;p=dpdk.git diff --git a/lib/librte_cmdline/cmdline_socket.c b/lib/librte_cmdline/cmdline_socket.c index f287690d23..3fc243b709 100644 --- a/lib/librte_cmdline/cmdline_socket.c +++ b/lib/librte_cmdline/cmdline_socket.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -86,14 +86,13 @@ cmdline_file_new(cmdline_parse_ctx_t *ctx, const char *prompt, const char *path) dprintf("open() failed\n"); return NULL; } - return (cmdline_new(ctx, prompt, fd, -1)); + return cmdline_new(ctx, prompt, fd, -1); } struct cmdline * cmdline_stdin_new(cmdline_parse_ctx_t *ctx, const char *prompt) { struct cmdline *cl; -#ifdef RTE_EXEC_ENV_LINUXAPP struct termios oldterm, term; tcgetattr(0, &oldterm); @@ -101,14 +100,12 @@ cmdline_stdin_new(cmdline_parse_ctx_t *ctx, const char *prompt) term.c_lflag &= ~(ICANON | ECHO | ISIG); tcsetattr(0, TCSANOW, &term); setbuf(stdin, NULL); -#endif cl = cmdline_new(ctx, prompt, 0, 1); -#ifdef RTE_EXEC_ENV_LINUXAPP if (cl) memcpy(&cl->oldterm, &oldterm, sizeof(term)); -#endif + return cl; } @@ -118,10 +115,5 @@ cmdline_stdin_exit(struct cmdline *cl) if (!cl) return; -#ifdef RTE_EXEC_ENV_LINUXAPP tcsetattr(fileno(stdin), TCSANOW, &cl->oldterm); -#else - /* silent the compiler */ - (void)cl; -#endif }