kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Minor cleanup of ast_el_read_char.

Browse Source 
* Define CHAR_T_LIBEDIT and CHAR_TO_LIBEDIT based on
  HAVE_LIBEDIT_IS_UNICODE.  This avoids needing to repeatedly use
  conditional blocks, eliminates having multiple function prototypes.
* Remove parenthesis from return values.
* Add missing code block brackets {}.
* Reduce use of 'else' conditional statements where possible.

Change-Id: I4315328ebea2f62641faf6881de2ac20a9f9d08e
This commit is contained in:
Corey Farrell
2018-03-17 17:41:13 -04:00
parent d5bfba60d2
commit 5b40441197
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
main/asterisk.c
View File

@@ -2732,10 +2732,14 @@ static void send_rasterisk_connect_commands(void)
}
#ifdef HAVE_LIBEDIT_IS_UNICODE
static int ast_el_read_char(EditLine *editline, wchar_t *cp)
#define CHAR_T_LIBEDIT wchar_t
#define CHAR_TO_LIBEDIT(c) btowc(c)
#else
static int ast_el_read_char(EditLine *editline, char *cp)
#define CHAR_T_LIBEDIT char
#define CHAR_TO_LIBEDIT(c) c
#endif
static int ast_el_read_char(EditLine *editline, CHAR_T_LIBEDIT *cp)
{
int num_read = 0;
int lastpos = 0;
@@ -2756,28 +2760,29 @@ static int ast_el_read_char(EditLine *editline, char *cp)
}
res = ast_poll(fds, max, -1);
if (res < 0) {
if (sig_flags.need_quit || sig_flags.need_quit_handler)
if (sig_flags.need_quit || sig_flags.need_quit_handler) {
break;
if (errno == EINTR)
}
if (errno == EINTR) {
continue;
}
fprintf(stderr, "poll failed: %s\n", strerror(errno));
break;
}
if (!ast_opt_exec && fds[1].revents) {
char c = '\0';
num_read = read(STDIN_FILENO, &c, 1);
if (num_read < 1) {
break;
} else {
#ifdef HAVE_LIBEDIT_IS_UNICODE
*cp = btowc(c);
#else
*cp = c;
#endif
return (num_read);
}
*cp = CHAR_TO_LIBEDIT(c);
return num_read;
}
if (fds[0].revents) {
res = read(ast_consock, buf, sizeof(buf) - 1);
/* if the remote side disappears exit */
@@ -2788,6 +2793,7 @@ static int ast_el_read_char(EditLine *editline, char *cp)
} else {
int tries;
int reconnects_per_second = 20;
fprintf(stderr, "Attempting to reconnect for 30 seconds\n");
for (tries = 0; tries < 30 * reconnects_per_second; tries++) {
if (ast_tryconnect()) {
@@ -2796,8 +2802,9 @@ static int ast_el_read_char(EditLine *editline, char *cp)
WELCOME_MESSAGE;
send_rasterisk_connect_commands();
break;
} else
usleep(1000000 / reconnects_per_second);
}
usleep(1000000 / reconnects_per_second);
}
if (tries >= 30 * reconnects_per_second) {
fprintf(stderr, "Failed to reconnect for 30 seconds. Quitting.\n");
@@ -2818,25 +2825,17 @@ static int ast_el_read_char(EditLine *editline, char *cp)
console_print(buf);
if ((res < EL_BUF_SIZE - 1) && ((buf[res-1] == '\n') || (res >= 2 && buf[res-2] == '\n'))) {
#ifdef HAVE_LIBEDIT_IS_UNICODE
*cp = btowc(CC_REFRESH);
#else
*cp = CC_REFRESH;
#endif
return(1);
} else {
lastpos = 1;
*cp = CHAR_TO_LIBEDIT(CC_REFRESH);
return 1;
}
lastpos = 1;
}
}
#ifdef HAVE_LIBEDIT_IS_UNICODE
*cp = btowc('\0');
#else
*cp = '\0';
#endif
*cp = CHAR_TO_LIBEDIT('\0');
return (0);
return 0;
}
static struct ast_str *prompt = NULL;