summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2000-05-14 02:29:30 +0000
committerthorpej <thorpej@NetBSD.org>2000-05-14 02:29:30 +0000
commitf5a2f2d1fcf3eaab89a61ef83725d898e4367ded (patch)
tree6cc61d365682044696b11d0064093cb89efa8c72 /gnu
parentbcb03e10afb9a91dfaaed32bf7cc7fa90ca29907 (diff)
String constants are const.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/dist/postfix/util/dict_open.c6
-rw-r--r--gnu/dist/postfix/util/dict_regexp.c4
-rw-r--r--gnu/dist/postfix/util/dir_forest.c2
-rw-r--r--gnu/dist/postfix/util/events.c12
-rw-r--r--gnu/dist/postfix/util/fifo_listen.c2
-rw-r--r--gnu/dist/postfix/util/fifo_trigger.c2
-rw-r--r--gnu/dist/postfix/util/fsspace.c2
-rw-r--r--gnu/dist/postfix/util/inet_addr_list.c2
-rw-r--r--gnu/dist/postfix/util/inet_addr_local.c2
-rw-r--r--gnu/dist/postfix/util/inet_connect.c4
-rw-r--r--gnu/dist/postfix/util/inet_trigger.c2
-rw-r--r--gnu/dist/postfix/util/inet_util.c2
-rw-r--r--gnu/dist/postfix/util/mac_expand.c2
-rw-r--r--gnu/dist/postfix/util/mac_parse.c2
-rw-r--r--gnu/dist/postfix/util/match_list.c6
-rw-r--r--gnu/dist/postfix/util/match_ops.c6
-rw-r--r--gnu/dist/postfix/util/msg_syslog.c4
-rw-r--r--gnu/dist/postfix/util/msg_vstream.c2
-rw-r--r--gnu/dist/postfix/util/name_mask.c2
-rw-r--r--gnu/dist/postfix/util/sane_link.c2
-rw-r--r--gnu/dist/postfix/util/sane_rename.c2
-rw-r--r--gnu/dist/postfix/util/scan_dir.c6
-rw-r--r--gnu/dist/postfix/util/spawn_command.c4
-rw-r--r--gnu/dist/postfix/util/stream_connect.c2
-rw-r--r--gnu/dist/postfix/util/stream_trigger.c2
-rw-r--r--gnu/dist/postfix/util/timed_wait.c2
-rw-r--r--gnu/dist/postfix/util/unix_trigger.c2
-rw-r--r--gnu/dist/postfix/util/valid_hostname.c4
-rw-r--r--gnu/dist/postfix/util/vstream.c14
-rw-r--r--gnu/dist/postfix/util/vstream_popen.c4
-rw-r--r--gnu/dist/postfix/util/watchdog.c10
31 files changed, 59 insertions, 61 deletions
diff --git a/gnu/dist/postfix/util/dict_open.c b/gnu/dist/postfix/util/dict_open.c
index 8f26ff63a9f..2170842fff8 100644
--- a/gnu/dist/postfix/util/dict_open.c
+++ b/gnu/dist/postfix/util/dict_open.c
@@ -214,7 +214,7 @@ static HTABLE *dict_open_hash;
static void dict_open_init(void)
{
- char *myname = "dict_open_init";
+ const char *myname = "dict_open_init";
DICT_OPEN_INFO *dp;
if (dict_open_hash != 0)
@@ -247,7 +247,7 @@ DICT *dict_open(const char *dict_spec, int open_flags, int dict_flags)
DICT *dict_open3(const char *dict_type, const char *dict_name,
int open_flags, int dict_flags)
{
- char *myname = "dict_open";
+ const char *myname = "dict_open";
DICT_OPEN_INFO *dp;
DICT *dict;
@@ -267,7 +267,7 @@ DICT *dict_open3(const char *dict_type, const char *dict_name,
void dict_open_register(const char *type,
DICT *(*open) (const char *, int, int))
{
- char *myname = "dict_open_register";
+ const char *myname = "dict_open_register";
DICT_OPEN_INFO *dp;
if (dict_open_hash == 0)
diff --git a/gnu/dist/postfix/util/dict_regexp.c b/gnu/dist/postfix/util/dict_regexp.c
index 85ae9a49c5e..45b87013532 100644
--- a/gnu/dist/postfix/util/dict_regexp.c
+++ b/gnu/dist/postfix/util/dict_regexp.c
@@ -333,11 +333,11 @@ static DICT_REGEXP_RULE *dict_regexp_parseline(int lineno, char *line, int *nsub
if (!*p) {
msg_warn("%s, line %d: no replacement text: using empty string",
VSTREAM_PATH(map_fp), lineno);
- p = "";
+ /* tested again below... */
}
rule->expr[0] = expr1;
rule->expr[1] = expr2;
- rule->replace = mystrdup(p);
+ rule->replace = mystrdup((*p == 0) ? "" : p);
rule->lineno = lineno;
rule->next = NULL;
return rule;
diff --git a/gnu/dist/postfix/util/dir_forest.c b/gnu/dist/postfix/util/dir_forest.c
index 289cd122e10..ba6f2f9334d 100644
--- a/gnu/dist/postfix/util/dir_forest.c
+++ b/gnu/dist/postfix/util/dir_forest.c
@@ -61,7 +61,7 @@
char *dir_forest(VSTRING *buf, const char *path, int depth)
{
- char *myname = "dir_forest";
+ const char *myname = "dir_forest";
static VSTRING *private_buf = 0;
int n;
const char *cp;
diff --git a/gnu/dist/postfix/util/events.c b/gnu/dist/postfix/util/events.c
index dc61e97c0c5..9e017f10f04 100644
--- a/gnu/dist/postfix/util/events.c
+++ b/gnu/dist/postfix/util/events.c
@@ -246,7 +246,7 @@ time_t event_time(void)
void event_enable_read(int fd, EVENT_NOTIFY_RDWR callback, char *context)
{
- char *myname = "event_enable_read";
+ const char *myname = "event_enable_read";
EVENT_FDTABLE *fdp;
if (EVENT_INIT_NEEDED())
@@ -285,7 +285,7 @@ void event_enable_read(int fd, EVENT_NOTIFY_RDWR callback, char *context)
void event_enable_write(int fd, EVENT_NOTIFY_RDWR callback, char *context)
{
- char *myname = "event_enable_write";
+ const char *myname = "event_enable_write";
EVENT_FDTABLE *fdp;
if (EVENT_INIT_NEEDED())
@@ -324,7 +324,7 @@ void event_enable_write(int fd, EVENT_NOTIFY_RDWR callback, char *context)
void event_disable_readwrite(int fd)
{
- char *myname = "event_disable_readwrite";
+ const char *myname = "event_disable_readwrite";
EVENT_FDTABLE *fdp;
if (EVENT_INIT_NEEDED())
@@ -355,7 +355,7 @@ void event_disable_readwrite(int fd)
time_t event_request_timer(EVENT_NOTIFY_TIME callback, char *context, int delay)
{
- char *myname = "event_request_timer";
+ const char *myname = "event_request_timer";
RING *ring;
EVENT_TIMER *timer;
@@ -419,7 +419,7 @@ time_t event_request_timer(EVENT_NOTIFY_TIME callback, char *context, int del
int event_cancel_timer(EVENT_NOTIFY_TIME callback, char *context)
{
- char *myname = "event_cancel_timer";
+ const char *myname = "event_cancel_timer";
RING *ring;
EVENT_TIMER *timer;
int time_left = -1;
@@ -452,7 +452,7 @@ int event_cancel_timer(EVENT_NOTIFY_TIME callback, char *context)
void event_loop(int delay)
{
- char *myname = "event_loop";
+ const char *myname = "event_loop";
static int nested;
fd_set rmask;
fd_set wmask;
diff --git a/gnu/dist/postfix/util/fifo_listen.c b/gnu/dist/postfix/util/fifo_listen.c
index c0a1ba6e679..62915c14c6c 100644
--- a/gnu/dist/postfix/util/fifo_listen.c
+++ b/gnu/dist/postfix/util/fifo_listen.c
@@ -52,7 +52,7 @@ int fifo_listen(const char *path, int permissions, int block_mode)
{
char buf[BUF_LEN];
static int open_mode = 0;
- char *myname = "fifo_listen";
+ const char *myname = "fifo_listen";
struct stat st;
int fd;
int count;
diff --git a/gnu/dist/postfix/util/fifo_trigger.c b/gnu/dist/postfix/util/fifo_trigger.c
index b2801143610..c471a7ac1c6 100644
--- a/gnu/dist/postfix/util/fifo_trigger.c
+++ b/gnu/dist/postfix/util/fifo_trigger.c
@@ -55,7 +55,7 @@
int fifo_trigger(const char *service, const char *buf, int len, int timeout)
{
- char *myname = "fifo_trigger";
+ const char *myname = "fifo_trigger";
int fd;
/*
diff --git a/gnu/dist/postfix/util/fsspace.c b/gnu/dist/postfix/util/fsspace.c
index e96daf5d58c..50a4aa7bcb4 100644
--- a/gnu/dist/postfix/util/fsspace.c
+++ b/gnu/dist/postfix/util/fsspace.c
@@ -67,7 +67,7 @@
void fsspace(const char *path, struct fsspace * sp)
{
- char *myname = "fsspace";
+ const char *myname = "fsspace";
#ifdef USE_STATFS
#ifdef USE_STRUCT_FS_DATA /* Ultrix */
diff --git a/gnu/dist/postfix/util/inet_addr_list.c b/gnu/dist/postfix/util/inet_addr_list.c
index d449e76c77d..658ca25e3c7 100644
--- a/gnu/dist/postfix/util/inet_addr_list.c
+++ b/gnu/dist/postfix/util/inet_addr_list.c
@@ -64,7 +64,7 @@ void inet_addr_list_init(INET_ADDR_LIST *list)
void inet_addr_list_append(INET_ADDR_LIST *list, struct in_addr * addr)
{
- char *myname = "inet_addr_list_append";
+ const char *myname = "inet_addr_list_append";
if (msg_verbose > 1)
msg_info("%s: %s", myname, inet_ntoa(*addr));
diff --git a/gnu/dist/postfix/util/inet_addr_local.c b/gnu/dist/postfix/util/inet_addr_local.c
index 9a53d8d6f8a..281acf1d71b 100644
--- a/gnu/dist/postfix/util/inet_addr_local.c
+++ b/gnu/dist/postfix/util/inet_addr_local.c
@@ -70,7 +70,7 @@
int inet_addr_local(INET_ADDR_LIST *addr_list)
{
- char *myname = "inet_addr_local";
+ const char *myname = "inet_addr_local";
struct ifconf ifc;
struct ifreq *ifr;
struct ifreq *the_end;
diff --git a/gnu/dist/postfix/util/inet_connect.c b/gnu/dist/postfix/util/inet_connect.c
index 152e498461e..e7dae6fcf07 100644
--- a/gnu/dist/postfix/util/inet_connect.c
+++ b/gnu/dist/postfix/util/inet_connect.c
@@ -81,11 +81,9 @@ int inet_connect(const char *addr, int block_mode, int timeout)
* the local host.
*/
buf = inet_parse(addr, &host, &port);
- if (*host == 0)
- host = "localhost";
memset((char *) &sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
- sin.sin_addr.s_addr = find_inet_addr(host);
+ sin.sin_addr.s_addr = find_inet_addr((*host == 0) ? "localhost" : host);
sin.sin_port = find_inet_port(port, "tcp");
myfree(buf);
diff --git a/gnu/dist/postfix/util/inet_trigger.c b/gnu/dist/postfix/util/inet_trigger.c
index e92c2d8dbfb..96b20837730 100644
--- a/gnu/dist/postfix/util/inet_trigger.c
+++ b/gnu/dist/postfix/util/inet_trigger.c
@@ -59,7 +59,7 @@
int inet_trigger(const char *service, const char *buf, int len, int timeout)
{
- char *myname = "inet_trigger";
+ const char *myname = "inet_trigger";
int fd;
if (msg_verbose > 1)
diff --git a/gnu/dist/postfix/util/inet_util.c b/gnu/dist/postfix/util/inet_util.c
index 47a41a28fe1..b3788f7f709 100644
--- a/gnu/dist/postfix/util/inet_util.c
+++ b/gnu/dist/postfix/util/inet_util.c
@@ -55,7 +55,7 @@ char *inet_parse(const char *addr, char **hostp, char **portp)
*hostp = buf;
} else {
*portp = buf;
- *hostp = "";
+ *hostp = ""; /* XXX bogus -- string constants not writeable */
}
return (buf);
}
diff --git a/gnu/dist/postfix/util/mac_expand.c b/gnu/dist/postfix/util/mac_expand.c
index 9dc0dd84ec7..27ab40f926e 100644
--- a/gnu/dist/postfix/util/mac_expand.c
+++ b/gnu/dist/postfix/util/mac_expand.c
@@ -115,7 +115,7 @@ typedef struct {
static int mac_expand_callback(int type, VSTRING *buf, char *ptr)
{
- char *myname = "mac_expand_callback";
+ const char *myname = "mac_expand_callback";
MAC_EXP *mc = (MAC_EXP *) ptr;
int lookup_mode;
const char *text;
diff --git a/gnu/dist/postfix/util/mac_parse.c b/gnu/dist/postfix/util/mac_parse.c
index 9bb07902f42..0c8b768f511 100644
--- a/gnu/dist/postfix/util/mac_parse.c
+++ b/gnu/dist/postfix/util/mac_parse.c
@@ -80,7 +80,7 @@
int mac_parse(const char *value, MAC_PARSE_FN action, char *context)
{
- char *myname = "mac_parse";
+ const char *myname = "mac_parse";
VSTRING *buf = vstring_alloc(1); /* result buffer */
const char *vp; /* value pointer */
const char *pp; /* open_paren pointer */
diff --git a/gnu/dist/postfix/util/match_list.c b/gnu/dist/postfix/util/match_list.c
index 7ae42d6d503..5ce14ce6ca0 100644
--- a/gnu/dist/postfix/util/match_list.c
+++ b/gnu/dist/postfix/util/match_list.c
@@ -88,10 +88,10 @@ struct MATCH_LIST {
static ARGV *match_list_parse(ARGV *list, char *string)
{
- char *myname = "match_list_parse";
+ const char *myname = "match_list_parse";
VSTRING *buf = 0;
VSTREAM *fp;
- char *delim = " ,\t\r\n";
+ const char *delim = " ,\t\r\n";
char *bp = string;
char *pattern;
char *cp;
@@ -154,7 +154,7 @@ MATCH_LIST *match_list_init(const char *patterns, int match_count,...)
int match_list_match(MATCH_LIST * list,...)
{
- char *myname = "match_list_match";
+ const char *myname = "match_list_match";
char **cpp;
char *pat;
int match;
diff --git a/gnu/dist/postfix/util/match_ops.c b/gnu/dist/postfix/util/match_ops.c
index 764866bbc1c..87cbd18e593 100644
--- a/gnu/dist/postfix/util/match_ops.c
+++ b/gnu/dist/postfix/util/match_ops.c
@@ -74,7 +74,7 @@
int match_string(const char *string, const char *pattern)
{
- char *myname = "match_string";
+ const char *myname = "match_string";
int match;
char *key;
@@ -112,7 +112,7 @@ int match_string(const char *string, const char *pattern)
int match_hostname(const char *name, const char *pattern)
{
- char *myname = "match_hostname";
+ const char *myname = "match_hostname";
const char *pd;
const char *entry;
char *next;
@@ -183,7 +183,7 @@ static int match_parse_mask(const char *pattern, unsigned long *net_bits,
int match_hostaddr(const char *addr, const char *pattern)
{
- char *myname = "match_hostaddr";
+ const char *myname = "match_hostaddr";
int mask_shift;
unsigned long mask_bits;
unsigned long net_bits;
diff --git a/gnu/dist/postfix/util/msg_syslog.c b/gnu/dist/postfix/util/msg_syslog.c
index 2ff60ce45e0..e939f69ce85 100644
--- a/gnu/dist/postfix/util/msg_syslog.c
+++ b/gnu/dist/postfix/util/msg_syslog.c
@@ -59,10 +59,10 @@
static void msg_syslog_print(int level, const char *text)
{
- static int log_level[] = {
+ static const int log_level[] = {
LOG_INFO, LOG_WARNING, LOG_ERR, LOG_CRIT, LOG_CRIT,
};
- static char *severity_name[] = {
+ static const char *severity_name[] = {
"info", "warning", "error", "fatal", "panic",
};
diff --git a/gnu/dist/postfix/util/msg_vstream.c b/gnu/dist/postfix/util/msg_vstream.c
index 154c00438ca..ad4d3f6e6c7 100644
--- a/gnu/dist/postfix/util/msg_vstream.c
+++ b/gnu/dist/postfix/util/msg_vstream.c
@@ -56,7 +56,7 @@ static VSTREAM *msg_stream;
static void msg_vstream_print(int level, const char *text)
{
- static char *level_text[] = {
+ static const char *level_text[] = {
"info", "warning", "error", "fatal", "panic",
};
diff --git a/gnu/dist/postfix/util/name_mask.c b/gnu/dist/postfix/util/name_mask.c
index 1d01439eac5..ef54bbebea0 100644
--- a/gnu/dist/postfix/util/name_mask.c
+++ b/gnu/dist/postfix/util/name_mask.c
@@ -44,7 +44,7 @@
int name_mask(NAME_MASK *table, const char *names)
{
- char *myname = "name_mask";
+ const char *myname = "name_mask";
char *saved_names = mystrdup(names);
char *bp = saved_names;
int result = 0;
diff --git a/gnu/dist/postfix/util/sane_link.c b/gnu/dist/postfix/util/sane_link.c
index 13c071cc7c1..dacf839c438 100644
--- a/gnu/dist/postfix/util/sane_link.c
+++ b/gnu/dist/postfix/util/sane_link.c
@@ -39,7 +39,7 @@
int sane_link(const char *from, const char *to)
{
- char *myname = "sane_link";
+ const char *myname = "sane_link";
int saved_errno;
struct stat from_st;
struct stat to_st;
diff --git a/gnu/dist/postfix/util/sane_rename.c b/gnu/dist/postfix/util/sane_rename.c
index 416f8976e8f..7a458c3f263 100644
--- a/gnu/dist/postfix/util/sane_rename.c
+++ b/gnu/dist/postfix/util/sane_rename.c
@@ -39,7 +39,7 @@
int sane_rename(const char *from, const char *to)
{
- char *myname = "sane_rename";
+ const char *myname = "sane_rename";
int saved_errno;
struct stat st;
diff --git a/gnu/dist/postfix/util/scan_dir.c b/gnu/dist/postfix/util/scan_dir.c
index 3c8cc2590bc..de124df5536 100644
--- a/gnu/dist/postfix/util/scan_dir.c
+++ b/gnu/dist/postfix/util/scan_dir.c
@@ -117,7 +117,7 @@ char *scan_dir_path(SCAN_DIR *scan)
void scan_dir_push(SCAN_DIR *scan, const char *path)
{
- char *myname = "scan_dir_push";
+ const char *myname = "scan_dir_push";
SCAN_INFO *info;
info = (SCAN_INFO *) mymalloc(sizeof(*info));
@@ -137,7 +137,7 @@ void scan_dir_push(SCAN_DIR *scan, const char *path)
SCAN_DIR *scan_dir_pop(SCAN_DIR *scan)
{
- char *myname = "scan_dir_pop";
+ const char *myname = "scan_dir_pop";
SCAN_INFO *info = scan->current;
SCAN_INFO *parent;
@@ -170,7 +170,7 @@ SCAN_DIR *scan_dir_open(const char *path)
char *scan_dir_next(SCAN_DIR *scan)
{
- char *myname = "scan_dir_next";
+ const char *myname = "scan_dir_next";
SCAN_INFO *info = scan->current;
struct dirent *dp;
diff --git a/gnu/dist/postfix/util/spawn_command.c b/gnu/dist/postfix/util/spawn_command.c
index 3f009d36edc..10dc2841b36 100644
--- a/gnu/dist/postfix/util/spawn_command.c
+++ b/gnu/dist/postfix/util/spawn_command.c
@@ -113,7 +113,7 @@ struct spawn_args {
static void get_spawn_args(struct spawn_args * args, int init_key, va_list ap)
{
- char *myname = "get_spawn_args";
+ const char *myname = "get_spawn_args";
int key;
/*
@@ -186,7 +186,7 @@ static void get_spawn_args(struct spawn_args * args, int init_key, va_list ap)
WAIT_STATUS_T spawn_command(int key,...)
{
- char *myname = "spawn_comand";
+ const char *myname = "spawn_comand";
va_list ap;
pid_t pid;
WAIT_STATUS_T wait_status;
diff --git a/gnu/dist/postfix/util/stream_connect.c b/gnu/dist/postfix/util/stream_connect.c
index be270c93d45..1e45cc0c49d 100644
--- a/gnu/dist/postfix/util/stream_connect.c
+++ b/gnu/dist/postfix/util/stream_connect.c
@@ -62,7 +62,7 @@
int stream_connect(const char *path, int block_mode, int unused_timeout)
{
#ifdef STREAM_CONNECTIONS
- char *myname = "stream_connect";
+ const char *myname = "stream_connect";
int pair[2];
int fifo;
diff --git a/gnu/dist/postfix/util/stream_trigger.c b/gnu/dist/postfix/util/stream_trigger.c
index 585f392bf6e..e202d9dfa55 100644
--- a/gnu/dist/postfix/util/stream_trigger.c
+++ b/gnu/dist/postfix/util/stream_trigger.c
@@ -57,7 +57,7 @@
int stream_trigger(const char *service, const char *buf, int len, int timeout)
{
- char *myname = "stream_trigger";
+ const char *myname = "stream_trigger";
int fd;
if (msg_verbose > 1)
diff --git a/gnu/dist/postfix/util/timed_wait.c b/gnu/dist/postfix/util/timed_wait.c
index 73f395feccd..45fbb69bf4c 100644
--- a/gnu/dist/postfix/util/timed_wait.c
+++ b/gnu/dist/postfix/util/timed_wait.c
@@ -80,7 +80,7 @@ static void timed_wait_alarm(int unused_sig)
int timed_waitpid(pid_t pid, WAIT_STATUS_T *statusp, int options,
int time_limit)
{
- char *myname = "timed_waitpid";
+ const char *myname = "timed_waitpid";
struct sigaction action;
struct sigaction old_action;
int time_left;
diff --git a/gnu/dist/postfix/util/unix_trigger.c b/gnu/dist/postfix/util/unix_trigger.c
index d0f03d6c78f..96c96e30c4b 100644
--- a/gnu/dist/postfix/util/unix_trigger.c
+++ b/gnu/dist/postfix/util/unix_trigger.c
@@ -57,7 +57,7 @@
int unix_trigger(const char *service, const char *buf, int len, int timeout)
{
- char *myname = "unix_trigger";
+ const char *myname = "unix_trigger";
int fd;
if (msg_verbose > 1)
diff --git a/gnu/dist/postfix/util/valid_hostname.c b/gnu/dist/postfix/util/valid_hostname.c
index 9f75963eba4..58c06bfaafe 100644
--- a/gnu/dist/postfix/util/valid_hostname.c
+++ b/gnu/dist/postfix/util/valid_hostname.c
@@ -52,7 +52,7 @@
int valid_hostname(const char *name)
{
- char *myname = "valid_hostname";
+ const char *myname = "valid_hostname";
const char *cp;
int label_length = 0;
int label_count = 0;
@@ -116,7 +116,7 @@ int valid_hostname(const char *name)
int valid_hostaddr(const char *addr)
{
const char *cp;
- char *myname = "valid_hostaddr";
+ const char *myname = "valid_hostaddr";
int in_byte = 0;
int byte_count = 0;
int byte_val = 0;
diff --git a/gnu/dist/postfix/util/vstream.c b/gnu/dist/postfix/util/vstream.c
index 7985ac32b4d..48359798308 100644
--- a/gnu/dist/postfix/util/vstream.c
+++ b/gnu/dist/postfix/util/vstream.c
@@ -402,7 +402,7 @@ static void vstream_buf_init(VBUF *bp, int flags)
static void vstream_buf_alloc(VBUF *bp, int len)
{
int used = bp->ptr - bp->data;
- char *myname = "vstream_buf_alloc";
+ const char *myname = "vstream_buf_alloc";
if (len < bp->len)
msg_panic("%s: attempt to shrink buffer", myname);
@@ -436,7 +436,7 @@ static void vstream_buf_wipe(VBUF *bp)
static int vstream_fflush_some(VSTREAM *stream, int to_flush)
{
- char *myname = "vstream_fflush_some";
+ const char *myname = "vstream_fflush_some";
VBUF *bp = &stream->buf;
int used;
int left_over;
@@ -544,7 +544,7 @@ static int vstream_fflush_delayed(VSTREAM *stream)
static int vstream_buf_get_ready(VBUF *bp)
{
VSTREAM *stream = VBUF_TO_APPL(bp, VSTREAM, buf);
- char *myname = "vstream_buf_get_ready";
+ const char *myname = "vstream_buf_get_ready";
int n;
/*
@@ -630,7 +630,7 @@ static int vstream_buf_get_ready(VBUF *bp)
static int vstream_buf_put_ready(VBUF *bp)
{
VSTREAM *stream = VBUF_TO_APPL(bp, VSTREAM, buf);
- char *myname = "vstream_buf_put_ready";
+ const char *myname = "vstream_buf_put_ready";
/*
* Sanity checks. Detect a change of I/O direction or position. If so,
@@ -677,7 +677,7 @@ static int vstream_buf_space(VBUF *bp, int want)
int used;
int incr;
int shortage;
- char *myname = "vstream_buf_space";
+ const char *myname = "vstream_buf_space";
/*
* Sanity checks. Reserving space implies writing. It is illegal to write
@@ -730,7 +730,7 @@ static int vstream_buf_space(VBUF *bp, int want)
long vstream_fseek(VSTREAM *stream, long offset, int whence)
{
- char *myname = "vstream_fseek";
+ const char *myname = "vstream_fseek";
VBUF *bp = &stream->buf;
/*
@@ -953,7 +953,7 @@ int vstream_fputs(const char *str, VSTREAM *stream)
void vstream_control(VSTREAM *stream, int name,...)
{
- char *myname = "vstream_control";
+ const char *myname = "vstream_control";
va_list ap;
for (va_start(ap, name); name != VSTREAM_CTL_END; name = va_arg(ap, int)) {
diff --git a/gnu/dist/postfix/util/vstream_popen.c b/gnu/dist/postfix/util/vstream_popen.c
index 4e741603c82..04956947589 100644
--- a/gnu/dist/postfix/util/vstream_popen.c
+++ b/gnu/dist/postfix/util/vstream_popen.c
@@ -126,7 +126,7 @@ typedef struct VSTREAM_POPEN_ARGS {
static VSTREAM *vstream_parse_args(VSTREAM_POPEN_ARGS *args, va_list ap)
{
- char *myname = "vstream_parse_args";
+ const char *myname = "vstream_parse_args";
int key;
/*
@@ -190,7 +190,7 @@ static VSTREAM *vstream_parse_args(VSTREAM_POPEN_ARGS *args, va_list ap)
VSTREAM *vstream_popen_vargs(int flags,...)
{
- char *myname = "vstream_popen_vargs";
+ const char *myname = "vstream_popen_vargs";
VSTREAM_POPEN_ARGS args;
va_list ap;
VSTREAM *stream;
diff --git a/gnu/dist/postfix/util/watchdog.c b/gnu/dist/postfix/util/watchdog.c
index e712c24e41e..fff4f5e8ff7 100644
--- a/gnu/dist/postfix/util/watchdog.c
+++ b/gnu/dist/postfix/util/watchdog.c
@@ -117,7 +117,7 @@ static WATCHDOG *watchdog_curr;
static void watchdog_event(int unused_sig)
{
- char *myname = "watchdog_event";
+ const char *myname = "watchdog_event";
WATCHDOG *wp;
/*
@@ -143,7 +143,7 @@ static void watchdog_event(int unused_sig)
WATCHDOG *watchdog_create(unsigned timeout, WATCHDOG_FN action, char *context)
{
- char *myname = "watchdog_create";
+ const char *myname = "watchdog_create";
struct sigaction sig_action;
WATCHDOG *wp;
@@ -172,7 +172,7 @@ WATCHDOG *watchdog_create(unsigned timeout, WATCHDOG_FN action, char *context)
void watchdog_destroy(WATCHDOG *wp)
{
- char *myname = "watchdog_destroy";
+ const char *myname = "watchdog_destroy";
watchdog_stop(wp);
watchdog_curr = wp->saved_watchdog;
@@ -189,7 +189,7 @@ void watchdog_destroy(WATCHDOG *wp)
void watchdog_start(WATCHDOG *wp)
{
- char *myname = "watchdog_start";
+ const char *myname = "watchdog_start";
if (wp != watchdog_curr)
msg_panic("%s: wrong watchdog instance", myname);
@@ -203,7 +203,7 @@ void watchdog_start(WATCHDOG *wp)
void watchdog_stop(WATCHDOG *wp)
{
- char *myname = "watchdog_stop";
+ const char *myname = "watchdog_stop";
if (wp != watchdog_curr)
msg_panic("%s: wrong watchdog instance", myname);