Page MenuHomeFreeBSD

D59612.id186509.diff
No OneTemporary

D59612.id186509.diff

diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -1313,10 +1313,10 @@
};
struct compat_state *st;
enum nss_lookup_type how;
- const char *name, *line;
+ const char *name, *line, *p;
struct group *grp;
gid_t gid;
- char *buffer, *p;
+ char *buffer;
void *discard;
size_t bufsize, linesize;
off_t pos;
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -467,7 +467,8 @@
static void
parse_tag(void)
{
- char *begin, *end, *p;
+ const char *begin, *end;
+ char *p;
pid_t pid;
if (LogTag == NULL || (LogStat & LOG_PID) != 0)
diff --git a/lib/libc/iconv/bsd_iconv.c b/lib/libc/iconv/bsd_iconv.c
--- a/lib/libc/iconv/bsd_iconv.c
+++ b/lib/libc/iconv/bsd_iconv.c
@@ -250,8 +250,7 @@
{
struct _citrus_iconv *cv;
struct iconv_hooks *hooks;
- const char *convname;
- char *dst;
+ const char *convname, *dst;
int *i;
size_t srclen;
diff --git a/lib/libc/iconv/citrus_prop.c b/lib/libc/iconv/citrus_prop.c
--- a/lib/libc/iconv/citrus_prop.c
+++ b/lib/libc/iconv/citrus_prop.c
@@ -81,7 +81,7 @@
{ \
_type_ acc, cutoff; \
int ch, cutlim, n; \
- char *p; \
+ const char *p; \
\
acc = (_type_)0; \
cutoff = _max_ / base; \
diff --git a/lib/libc/inet/inet_cidr_pton.c b/lib/libc/inet/inet_cidr_pton.c
--- a/lib/libc/inet/inet_cidr_pton.c
+++ b/lib/libc/inet/inet_cidr_pton.c
@@ -251,7 +251,8 @@
static int
getbits(const char *src, int ipv6) {
int bits = 0;
- char *cp, ch;
+ const char *cp;
+ char ch;
if (*src == '\0') /*%< syntax */
return (-2);
diff --git a/lib/libc/nameser/ns_name.c b/lib/libc/nameser/ns_name.c
--- a/lib/libc/nameser/ns_name.c
+++ b/lib/libc/nameser/ns_name.c
@@ -216,7 +216,7 @@
ns_name_pton2(const char *src, u_char *dst, size_t dstsiz, size_t *dstlen) {
u_char *label, *bp, *eom;
int c, n, escaped, e = 0;
- char *cp;
+ const char *cp;
escaped = 0;
bp = dst;
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
--- a/lib/libc/net/base64.c
+++ b/lib/libc/net/base64.c
@@ -193,7 +193,7 @@
{
int tarindex, state, ch;
u_char nextbyte;
- char *pos;
+ const char *pos;
state = 0;
tarindex = 0;
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -272,7 +272,7 @@
static void set_source(struct ai_order *, struct policyhead *);
static int comp_dst(const void *, const void *);
#ifdef INET6
-static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *);
+static int ip6_str2scopeid(const char *, struct sockaddr_in6 *, u_int32_t *);
#endif
static int gai_addr2scopetype(struct sockaddr *);
@@ -1338,7 +1338,8 @@
const struct afd *afd;
struct addrinfo *cur;
int error;
- char *cp, *hostname2 = NULL, *scope, *addr;
+ char *hostname2 = NULL, *addr;
+ const char *cp, *scope;
struct sockaddr_in6 *sin6;
afd = find_afd(pai->ai_family);
@@ -1682,7 +1683,7 @@
/* convert a string to a scope identifier. XXX: IPv6 specific */
static int
-ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid)
+ip6_str2scopeid(const char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid)
{
u_long lscopeid;
struct in6_addr *a6;
diff --git a/lib/libc/net/rcmdsh.c b/lib/libc/net/rcmdsh.c
--- a/lib/libc/net/rcmdsh.c
+++ b/lib/libc/net/rcmdsh.c
@@ -62,7 +62,7 @@
struct addrinfo hints, *res;
int sp[2], error;
pid_t cpid;
- char *p;
+ const char *p;
struct passwd *pw;
char num[8];
static char hbuf[NI_MAXHOST];
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -113,7 +113,7 @@
_gettemp(int dfd, char *path, int *doopen, int domkdir, int slen, int oflags)
{
char *start, *trv, *suffp, *carryp;
- char *pad;
+ const char *pad;
struct stat sbuf;
uint32_t rand;
char carrybuf[MAXPATHLEN];

File Metadata

Mime Type
text/plain
Expires
Sun, Sep 13, 4:23 PM (16 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38863595
Default Alt Text
D59612.id186509.diff (3 KB)

Event Timeline