1
1

completion: fixed multiple warnings: char * -> const char *

Signed-off-by: Sergei Trofimovich <st@anti-virus.by>
Этот коммит содержится в:
Sergei Trofimovich 2009-07-15 15:54:18 +03:00 коммит произвёл Slava Zanko
родитель bfdf10127c
Коммит a608322f24

Просмотреть файл

@ -48,7 +48,7 @@
#include "key.h" /* XCTRL and ALT macros */ #include "key.h" /* XCTRL and ALT macros */
#include "strutil.h" #include "strutil.h"
typedef char *CompletionFunction (char * text, int state, INPUT_COMPLETE_FLAGS flags); typedef char *CompletionFunction (const char * text, int state, INPUT_COMPLETE_FLAGS flags);
/* #define DO_COMPLETION_DEBUG */ /* #define DO_COMPLETION_DEBUG */
#ifdef DO_COMPLETION_DEBUG #ifdef DO_COMPLETION_DEBUG
@ -232,7 +232,7 @@ filename_completion_function (const char * text, int state, INPUT_COMPLETE_FLAGS
/* We assume here that text[0] == '~' , if you want to call it in another way, /* We assume here that text[0] == '~' , if you want to call it in another way,
you have to change the code */ you have to change the code */
static char * static char *
username_completion_function (char *text, int state, INPUT_COMPLETE_FLAGS flags) username_completion_function (const char *text, int state, INPUT_COMPLETE_FLAGS flags)
{ {
static struct passwd *entry; static struct passwd *entry;
static size_t userlen; static size_t userlen;
@ -270,7 +270,7 @@ extern char **environ;
/* We assume text [0] == '$' and want to have a look at text [1], if it is /* We assume text [0] == '$' and want to have a look at text [1], if it is
equal to '{', so that we should append '}' at the end */ equal to '{', so that we should append '}' at the end */
static char * static char *
variable_completion_function (char *text, int state, INPUT_COMPLETE_FLAGS flags) variable_completion_function (const char *text, int state, INPUT_COMPLETE_FLAGS flags)
{ {
static char **env_p; static char **env_p;
static int varlen, isbrace; static int varlen, isbrace;
@ -395,7 +395,7 @@ static void fetch_hosts (const char *filename)
} }
static char * static char *
hostname_completion_function (char *text, int state, INPUT_COMPLETE_FLAGS flags) hostname_completion_function (const char *text, int state, INPUT_COMPLETE_FLAGS flags)
{ {
static char **host_p; static char **host_p;
static int textstart, textlen; static int textstart, textlen;
@ -587,7 +587,7 @@ match_compare (const void *a, const void *b)
as the second. as the second.
In case no matches were found we return NULL. */ In case no matches were found we return NULL. */
static char ** static char **
completion_matches (char *text, CompletionFunction entry_function, INPUT_COMPLETE_FLAGS flags) completion_matches (const char *text, CompletionFunction entry_function, INPUT_COMPLETE_FLAGS flags)
{ {
/* Number of slots in match_list. */ /* Number of slots in match_list. */
int match_list_size; int match_list_size;
@ -762,7 +762,7 @@ try_complete (char *text, int *start, int *end, INPUT_COMPLETE_FLAGS flags)
/* Command substitution? */ /* Command substitution? */
if (p > q && p > r){ if (p > q && p > r){
SHOW_C_CTX("try_complete:cmd_backq_subst"); SHOW_C_CTX("try_complete:cmd_backq_subst");
matches = completion_matches (str_get_next_char (p), matches = completion_matches (str_cget_next_char (p),
command_completion_function, command_completion_function,
flags & (~INPUT_COMPLETE_FILENAMES)); flags & (~INPUT_COMPLETE_FILENAMES));
if (matches) if (matches)