const-ize and remove some casts
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7126 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -143,7 +143,7 @@ TTYput(unsigned char c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
TTYputs(unsigned char *p)
|
TTYputs(const unsigned char *p)
|
||||||
{
|
{
|
||||||
while (*p)
|
while (*p)
|
||||||
TTYput(*p++);
|
TTYput(*p++);
|
||||||
@@ -197,7 +197,7 @@ TTYget()
|
|||||||
return EOF;
|
return EOF;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define TTYback() (backspace ? TTYputs((unsigned char *)backspace) : TTYput('\b'))
|
#define TTYback() (backspace ? TTYputs(backspace) : TTYput('\b'))
|
||||||
|
|
||||||
static void
|
static void
|
||||||
TTYbackn(int n)
|
TTYbackn(int n)
|
||||||
@@ -278,7 +278,7 @@ columns(int ac, unsigned char **av)
|
|||||||
longest = j;
|
longest = j;
|
||||||
cols = TTYwidth / (longest + 3);
|
cols = TTYwidth / (longest + 3);
|
||||||
|
|
||||||
TTYputs((unsigned char *)NEWLINE);
|
TTYputs(NEWLINE);
|
||||||
for (skip = ac / cols + 1, i = 0; i < skip; i++) {
|
for (skip = ac / cols + 1, i = 0; i < skip; i++) {
|
||||||
for (j = i; j < ac; j += skip) {
|
for (j = i; j < ac; j += skip) {
|
||||||
for (p = av[j], len = strlen((char *)p), k = len; --k >= 0; p++)
|
for (p = av[j], len = strlen((char *)p), k = len; --k >= 0; p++)
|
||||||
@@ -287,7 +287,7 @@ columns(int ac, unsigned char **av)
|
|||||||
while (++len < longest + 3)
|
while (++len < longest + 3)
|
||||||
TTYput(' ');
|
TTYput(' ');
|
||||||
}
|
}
|
||||||
TTYputs((unsigned char *)NEWLINE);
|
TTYputs(NEWLINE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -298,7 +298,7 @@ reposition()
|
|||||||
unsigned char *p;
|
unsigned char *p;
|
||||||
|
|
||||||
TTYput('\r');
|
TTYput('\r');
|
||||||
TTYputs((unsigned char *)Prompt);
|
TTYputs(Prompt);
|
||||||
for (i = Point, p = Line; --i >= 0; p++)
|
for (i = Point, p = Line; --i >= 0; p++)
|
||||||
TTYshow(*p);
|
TTYshow(*p);
|
||||||
}
|
}
|
||||||
@@ -615,12 +615,12 @@ h_search()
|
|||||||
clear_line();
|
clear_line();
|
||||||
old_prompt = Prompt;
|
old_prompt = Prompt;
|
||||||
Prompt = "Search: ";
|
Prompt = "Search: ";
|
||||||
TTYputs((unsigned char *)Prompt);
|
TTYputs(Prompt);
|
||||||
move = Repeat == NO_ARG ? prev_hist : next_hist;
|
move = Repeat == NO_ARG ? prev_hist : next_hist;
|
||||||
p = search_hist(editinput(), move);
|
p = search_hist(editinput(), move);
|
||||||
clear_line();
|
clear_line();
|
||||||
Prompt = old_prompt;
|
Prompt = old_prompt;
|
||||||
TTYputs((unsigned char *)Prompt);
|
TTYputs(Prompt);
|
||||||
|
|
||||||
Searching = 0;
|
Searching = 0;
|
||||||
return do_insert_hist(p);
|
return do_insert_hist(p);
|
||||||
@@ -732,8 +732,8 @@ bk_del_char()
|
|||||||
static STATUS
|
static STATUS
|
||||||
redisplay()
|
redisplay()
|
||||||
{
|
{
|
||||||
TTYputs((unsigned char *)NEWLINE);
|
TTYputs(NEWLINE);
|
||||||
TTYputs((unsigned char *)Prompt);
|
TTYputs(Prompt);
|
||||||
TTYstring(Line);
|
TTYstring(Line);
|
||||||
return CSmove;
|
return CSmove;
|
||||||
}
|
}
|
||||||
@@ -961,10 +961,10 @@ readline(const char* prompt)
|
|||||||
ScreenSize = SCREEN_INC;
|
ScreenSize = SCREEN_INC;
|
||||||
Screen = malloc(ScreenSize);
|
Screen = malloc(ScreenSize);
|
||||||
Prompt = prompt ? prompt : (char *)NIL;
|
Prompt = prompt ? prompt : (char *)NIL;
|
||||||
TTYputs((unsigned char *)Prompt);
|
TTYputs(Prompt);
|
||||||
if ((line = editinput()) != NULL) {
|
if ((line = editinput()) != NULL) {
|
||||||
line = (unsigned char *)strdup((char *)line);
|
line = (unsigned char *)strdup((char *)line);
|
||||||
TTYputs((unsigned char *)NEWLINE);
|
TTYputs(NEWLINE);
|
||||||
TTYflush();
|
TTYflush();
|
||||||
}
|
}
|
||||||
rl_ttyset(1);
|
rl_ttyset(1);
|
||||||
|
Reference in New Issue
Block a user