empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s_char purge directed by compiler warnings.

Browse source
This commit is contained in:
Markus Armbruster 2006-04-29 06:41:45 +00:00
parent 87b5d5d6e3
commit a988b907fc
130 changed files with 527 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/gen/copy.c
View file

@ -44,11 +44,11 @@
* null terminate
*/
void
blankfill(s_char *ptr, register struct range *range, int size)
blankfill(char *ptr, struct range *range, int size)
{
register s_char *p;
register int row;
register int col;
char *p;
int row;
int col;
for (row = 0; row < range->height; row++) {
col = (range->width + 1) * (size + 1) / 2 - 1;

6
src/lib/gen/emp_config.c
View file

@ -67,7 +67,7 @@ struct keymatch configkeys[] = {
#undef EMP_CONFIG_C_OUTPUT
};
static struct keymatch *keylookup(s_char *key, struct keymatch tbl[]);
static struct keymatch *keylookup(char *key, struct keymatch tbl[]);
static void set_dirs(char *);
/*
@ -159,9 +159,9 @@ done:
/* find the key in the table */
static struct keymatch *
keylookup(register s_char *command, struct keymatch *tbl)
keylookup(char *command, struct keymatch *tbl)
{
register struct keymatch *kp;
struct keymatch *kp;
if (command == 0 || *command == 0)
return 0;

12
src/lib/gen/io.c
View file

@ -126,7 +126,7 @@ io_close(struct iop *iop)
int
io_input(struct iop *iop, int waitforinput)
{
s_char buf[IO_BUFSIZE];
char buf[IO_BUFSIZE];
int cc;
/* Not a read IOP */
@ -278,7 +278,7 @@ io_output(struct iop *iop, int waitforoutput)
}
int
io_peek(struct iop *iop, s_char *buf, int nbytes)
io_peek(struct iop *iop, char *buf, int nbytes)
{
if ((iop->flags & IO_READ) == 0)
return -1;
@ -286,7 +286,7 @@ io_peek(struct iop *iop, s_char *buf, int nbytes)
}
int
io_read(struct iop *iop, s_char *buf, int nbytes)
io_read(struct iop *iop, char *buf, int nbytes)
{
int cc;
@ -299,7 +299,7 @@ io_read(struct iop *iop, s_char *buf, int nbytes)
}
int
io_write(struct iop *iop, s_char *buf, int nbytes, int doWait)
io_write(struct iop *iop, char *buf, int nbytes, int doWait)
{
int len;
@ -335,7 +335,7 @@ io_output_all(struct iop *iop)
}
int
io_gets(struct iop *iop, s_char *buf, int nbytes)
io_gets(struct iop *iop, char *buf, int nbytes)
{
if ((iop->flags & IO_READ) == 0)
return -1;
@ -343,7 +343,7 @@ io_gets(struct iop *iop, s_char *buf, int nbytes)
}
int
io_puts(struct iop *iop, s_char *buf)
io_puts(struct iop *iop, char *buf)
{
if ((iop->flags & IO_WRITE) == 0)
return -1;

22
src/lib/gen/ioqueue.c
View file

@ -49,14 +49,14 @@
#include "queue.h"
#include "ioqueue.h"
static int ioqtocbuf(struct ioqueue *ioq, s_char *buf, int cc,
static int ioqtocbuf(struct ioqueue *ioq, char *buf, int cc,
register int stopc);
#if !defined(_WIN32)
static int ioqtoiov(struct ioqueue *ioq, struct iovec *iov,
register int max);
#endif
static int ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc);
static int appendcc(struct ioqueue *ioq, s_char *buf, int cc);
static int ioqtobuf(struct ioqueue *ioq, char *buf, int cc);
static int appendcc(struct ioqueue *ioq, char *buf, int cc);
static int removecc(struct ioqueue *ioq, register int cc);
#if defined(_WIN32)
@ -123,7 +123,7 @@ ioq_makeiov(struct ioqueue *ioq, struct iovec *iov, int cc)
* number of bytes actually found.
*/
int
ioq_peek(struct ioqueue *ioq, s_char *buf, int cc)
ioq_peek(struct ioqueue *ioq, char *buf, int cc)
{
return ioqtobuf(ioq, buf, cc);
}
@ -135,7 +135,7 @@ ioq_dequeue(struct ioqueue *ioq, int cc)
}
void
ioq_append(struct ioqueue *ioq, s_char *buf, int cc)
ioq_append(struct ioqueue *ioq, char *buf, int cc)
{
appendcc(ioq, buf, cc);
}
@ -152,7 +152,7 @@ ioq_qsize(struct ioqueue *ioq)
* no input is available
*/
int
ioq_gets(struct ioqueue *ioq, s_char *buf, int cc)
ioq_gets(struct ioqueue *ioq, char *buf, int cc)
{
int nbytes;
int actual;
@ -173,7 +173,7 @@ ioq_gets(struct ioqueue *ioq, s_char *buf, int cc)
}
int
ioq_puts(struct ioqueue *ioq, s_char *buf)
ioq_puts(struct ioqueue *ioq, char *buf)
{
return appendcc(ioq, buf, strlen(buf));
}
@ -189,14 +189,14 @@ ioq_puts(struct ioqueue *ioq, s_char *buf)
* left for a higher level.
*/
static int
ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc)
ioqtobuf(struct ioqueue *ioq, char *buf, int cc)
{
struct io *io;
struct emp_qelem *qp;
struct emp_qelem *head;
register int nbytes;
register int nleft;
register s_char *offset;
char *offset;
nleft = cc;
offset = buf;
@ -223,7 +223,7 @@ ioqtobuf(struct ioqueue *ioq, s_char *buf, int cc)
* terminating on the stop character.
*/
static int
ioqtocbuf(struct ioqueue *ioq, s_char *buf, int cc, register int stopc)
ioqtocbuf(struct ioqueue *ioq, char *buf, int cc, register int stopc)
{
register int nbytes;
register s_char *p;
@ -294,7 +294,7 @@ ioqtoiov(struct ioqueue *ioq, struct iovec *iov, register int max)
* append a buffer to the end of the ioq.
*/
static int
appendcc(struct ioqueue *ioq, s_char *buf, int cc)
appendcc(struct ioqueue *ioq, char *buf, int cc)
{
struct io *io;
int len;

12
src/lib/gen/numstr.c
View file

@ -37,16 +37,16 @@
#include "misc.h"
#include "gen.h"
s_char *
numstr(s_char *buf, int n)
char *
numstr(char *buf, int n)
{
static s_char *numnames[] = {
static char *numnames[] = {
"zero", "one", "two", "three", "four", "five", "six",
"seven", "eight", "nine", "ten", "eleven", "twelve",
"thirteen", "fourteen", "fifteen", "sixteen",
"seventeen", "eighteen", "nineteen",
};
static s_char *tennames[] = {
static char *tennames[] = {
"", "", "twenty", "thirty", "forty", "fifty",
"sixty", "seventy", "eighty", "ninety",
"hundred", "hundred ten", "hundred twenty",
@ -71,10 +71,10 @@ numstr(s_char *buf, int n)
return buf;
}
s_char *
char *
effadv(int n)
{
static s_char *effadv_list[] = {
static char *effadv_list[] = {
"minimally", "partially", "moderately", "completely",
};

4
src/lib/gen/onearg.c
View file

@ -37,10 +37,10 @@
#include "gen.h"
int
onearg(s_char *arg, s_char *prompt)
onearg(char *arg, char *prompt)
{
int n;
s_char buf[1024];
char buf[1024];
if (arg == 0 || *arg == 0) {
if ((arg = getstring(prompt, buf)) == 0)

6
src/lib/gen/plur.c
View file

@ -35,19 +35,19 @@
#include "prototypes.h"
s_char *
char *
splur(int n)
{
return n == 1 ? "" : "s";
}
s_char *
char *
esplur(int n)
{
return n == 1 ? "" : "es";
}
s_char *
char *
iesplur(int n)
{
return n == 1 ? "y" : "ies";