--- libaitcli/src/aitcli.c 2013/01/17 16:04:31 1.5.4.1 +++ libaitcli/src/aitcli.c 2013/05/26 20:36:41 1.5.4.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcli.c,v 1.5.4.1 2013/01/17 16:04:31 misho Exp $ +* $Id: aitcli.c,v 1.5.4.3 2013/05/26 20:36:41 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -55,21 +55,21 @@ char cli_Error[STRSIZ]; #pragma GCC visibility pop // cli_GetErrno() Get error code of last operation -inline int +int cli_GetErrno() { return cli_Errno; } // cli_GetError() Get error text of last operation -inline const char * +const char * cli_GetError() { return cli_Error; } // cli_SetErr() Set error to variables for internal use!!! -inline void +void cli_SetErr(int eno, char *estr, ...) { va_list lst; @@ -514,7 +514,7 @@ bufHelp(int idx, void * __restrict buffer) * @... = arguments defined in fmt * return: none */ -inline void +void cli_Printf(linebuffer_t * __restrict buffer, char *fmt, ...) { va_list lst; @@ -531,7 +531,7 @@ cli_Printf(linebuffer_t * __restrict buffer, char *fmt vfprintf(f, fmt, lst); va_end(lst); } else - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); } /* @@ -540,14 +540,14 @@ cli_Printf(linebuffer_t * __restrict buffer, char *fmt * @buffer = CLI buffer * return: none */ -inline void +void cli_PrintHelp(linebuffer_t * __restrict buffer) { if (buffer) { bufHelp(0, buffer); clrscrEOL(buffer); } else - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); } @@ -564,7 +564,7 @@ cli_BindKey(bindkey_t * __restrict key, linebuffer_t * register int i; if (!key || !buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } @@ -597,7 +597,7 @@ cli_addCommand(linebuffer_t * __restrict buffer, const struct tagCommand *cmd; if (!buffer || !csCmd) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } @@ -634,7 +634,7 @@ cli_delCommand(linebuffer_t * __restrict buffer, const int ret = RETCODE_OK; if (!buffer || !csCmd) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } @@ -668,7 +668,7 @@ cli_updCommand(linebuffer_t * __restrict buffer, const int ret = RETCODE_OK; if (!buffer || !csCmd) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } @@ -703,7 +703,7 @@ cli_addHistory(linebuffer_t * __restrict buffer, const struct tagHistory *h; if (!buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } @@ -752,7 +752,7 @@ cli_saveHistory(linebuffer_t * __restrict buffer, cons struct tagHistory *h; if (!buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } if (!histfile) @@ -797,7 +797,7 @@ cli_loadHistory(linebuffer_t * __restrict buffer, cons struct tagHistory *h; if (!buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } if (!histfile) @@ -837,7 +837,7 @@ cli_loadHistory(linebuffer_t * __restrict buffer, cons * @buffer = CLI buffer * return: none */ -inline void +void cli_resetHistory(linebuffer_t * __restrict buffer) { buffer->line_h = NULL; @@ -850,7 +850,7 @@ cli_resetHistory(linebuffer_t * __restrict buffer) * @buffer = CLI buffer * return: RETCODE_ERR error, RETCODE_OK ok */ -inline int +int cli_freeLine(linebuffer_t * __restrict buffer) { int code = RETCODE_ERR; @@ -869,7 +869,7 @@ cli_freeLine(linebuffer_t * __restrict buffer) } else LOGERR; } else - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return code; } @@ -881,7 +881,7 @@ cli_freeLine(linebuffer_t * __restrict buffer) * @prompt = new text for prompt or if NULL disable prompt * return: none */ -inline void +void cli_setPrompt(linebuffer_t * __restrict buffer, const char *prompt) { if (buffer) { @@ -901,7 +901,7 @@ cli_setPrompt(linebuffer_t * __restrict buffer, const LOGERR; } } else - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); } @@ -938,7 +938,7 @@ cliEnd(linebuffer_t * __restrict buffer) e_free(buffer); buffer = NULL; } else - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); } /* @@ -1234,7 +1234,7 @@ cliReadLine(linebuffer_t * __restrict buffer) char buf[BUFSIZ], *str = NULL; if (!buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return NULL; } @@ -1259,7 +1259,7 @@ cliReadLine(linebuffer_t * __restrict buffer) if (buffer->line_buf) str = e_strdup(buffer->line_buf); else - cli_SetErr(EPIPE, "Error:: unknown state ..."); + cli_SetErr(EPIPE, "Unknown state ..."); return str; } @@ -1317,7 +1317,7 @@ cliNetLoop(linebuffer_t * __restrict buffer, const cha return -1; case 0: if (!buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return -1; } else close(sock);