Merge "Ron's suggestions for variadic commit and const in rest of mem* funcs. Still missing regress."

sys/include/control.h

@@ -218,5 +218,4 @@ Control*	createtextbutton3(Controlset*, char*);
 void		resizecontrolset(Controlset*);
 
 int		_ctlsnarffd;
-//char		*alignnames[];
 int		ctldeletequits;

sys/include/libc.h

@@ -19,10 +19,10 @@
  */
 extern	void*	memccpy(void*, const void*, int, uint32_t);
 extern	void*	memset(void*, int, uint32_t);
-extern	int	memcmp(void*, void*, uint32_t);
-extern	void*	memcpy(void*, void*, size_t);
-extern	void*	memmove(void*, void*, size_t);
-extern	void*	memchr(void*, int, uint32_t);
+extern	int	memcmp(const void*, const void*, uint32_t);
+extern	void*	memcpy(void*, const void*, size_t);
+extern	void*	memmove(void*, const void*, size_t);
+extern	void*	memchr(const void*, int, uint32_t);
 
 /*
  * string routines

sys/src/cmd/9nfs/nfsmount.c

@@ -154,7 +154,7 @@ srvinit(int fd, char *file, char *addr)
 	chat("attach as none...");
 	f = newfid(s);
 	s->f.fid = f - s->fids;
-	s->f.afid = ~0x0UL&0xFF;
+	s->f.afid = (int64_t)~0x0UL;
 	s->f.uname = "none";
 	s->f.aname = s->spec;
 	if(xmesg(s, Tattach)){

sys/src/cmd/9nfs/rpc.h

@@ -82,9 +82,9 @@ enum
 	IPPROTO_UDP	= 17	/* protocol number for UDP/IP */
 };
 
-#define	ROUNDUP(n)	((n) + ((-(n))&3))	
+#define	ROUNDUP(n)	((n) + ((-(n))&3))
 
-#define	PLONG(x)	(dataptr[3] = ((uint32_t)(x)&0xFF), dataptr[2] = ((uint32_t)(x))>>8&0xFF, dataptr[1] = ((uint32_t)(x))>>16&0xFF, dataptr[0] = ((uint32_t)(x))>>24&0xFF, dataptr += 4)
+#define	PLONG(x)	(dataptr[3] = ((uint8_t)(x)), dataptr[2] = ((uint8_t)(x))>>8, dataptr[1] = ((uint8_t)(x))>>16, dataptr[0] = ((uint8_t)(x))>>24, dataptr += 4)
 #define	PPTR(x, n)	(memmove(dataptr, (x), n), dataptr += ROUNDUP(n))
 #define	PBYTE(x)	(*dataptr++ = (x))
 

sys/src/cmd/dossrv/dossubs.c

@@ -1885,20 +1885,20 @@ dirdump(void *vdbuf)
 		seprint(buf, ebuf, "\"%s\" %2.2x %2.2ux %2.2ux %d", name, dbuf[0], dbuf[12], dbuf[13], GSHORT(d->start));
 	}else{
 		s = seprint(buf, ebuf, "\"%.8s.%.3s\" ", (char*)d->name,
-			    (char*)d->ext);
+				(char*)d->ext);
 		for(i=7; i>=0; i--)
 			*s++ = d->attr&(1<<i) ? attrchar[i] : '-';
-	
+
 		i = GSHORT(d->time);
 		s = seprint(s, ebuf, " %2.2d:%2.2d:%2.2d", i>>11, (i>>5)&63, (i&31)<<1);
 		i = GSHORT(d->date);
 		s = seprint(s, ebuf, " %2.2d.%2.2d.%2.2d", 80+(i>>9), (i>>5)&15, i&31);
-	
+
 		i = GSHORT(d->ctime);
 		s = seprint(s, ebuf, " %2.2d:%2.2d:%2.2d", i>>11, (i>>5)&63, (i&31)<<1);
 		i = GSHORT(d->cdate);
 		s = seprint(s, ebuf, " %2.2d.%2.2d.%2.2d", 80+(i>>9), (i>>5)&15, i&31);
-	
+
 		i = GSHORT(d->adate);
 		s = seprint(s, ebuf, " %2.2d.%2.2d.%2.2d", 80+(i>>9), (i>>5)&15, i&31);
 

sys/src/libc/port/execl.c

@@ -16,7 +16,7 @@ execl(char *f, ...)
 {
 	va_list va, va2;
 	char *arg;
-	int n, ret;
+	int n;
 
 	va_start(va, f);
 	va_copy(va2, va);

sys/src/libc/port/memchr.c

@@ -11,15 +11,15 @@
 #include	<libc.h>
 
 void*
-memchr(void *ap, int c, uint32_t n)
+memchr(const void *ap, int c, uint32_t n)
 {
-	uint8_t *sp;
+	const char *sp;
 
 	sp = ap;
 	c &= 0xFF;
 	while(n > 0) {
 		if(*sp++ == c)
-			return sp-1;
+			return (char *)sp-1;
 		n--;
 	}
 	return 0;

sys/src/libc/port/memcmp.c

@@ -11,9 +11,9 @@
 #include	<libc.h>
 
 int
-memcmp(void *a1, void *a2, uint32_t n)
+memcmp(const void *a1, const void *a2, uint32_t n)
 {
-	uint8_t *s1, *s2;
+	const char *s1, *s2;
 	uint c1, c2;
 
 	s1 = a1;

sys/src/libc/port/memmove.c

@@ -11,9 +11,10 @@
 #include	<libc.h>
 
 void*
-memmove(void *a1, void *a2, size_t n)
+memmove(void *a1, const void *a2, size_t n)
 {
-	char *s1, *s2;
+	char *s1;
+	const char *s2;
 
 	if((int32_t)n < 0)
 		abort();
@@ -38,7 +39,7 @@ back:
 }
 
 void*
-memcpy(void *a1, void *a2, size_t n)
+memcpy(void *a1, const void *a2, size_t n)
 {
 	return memmove(a1, a2, n);
 }

sys/src/libventi/log.c

@@ -56,7 +56,7 @@ vtlognames(int *pn)
 		nname++;
 		size += strlen(l->name)+1;
 	}
-	
+
 	s = vtmalloc(nname*sizeof(char*)+size);
 	a = (char*)(s+nname);
 	e = (char*)s+nname*sizeof(char*)+size;
@@ -122,12 +122,12 @@ vtlogopen(char *name, uint size)
 	}
 	strcpy(p, name);
 	l->name = p;
-	
+
 	/* insert */
 	l->next = vl.hash[h];
 	vl.hash[h] = l;
 	l->ref++;
-	
+
 	l->ref++;
 	qunlock(&vl.lk);
 	return l;
@@ -196,13 +196,12 @@ vtlogvprint(VtLog *l, char *fmt, ...)
 
 	if(l == nil)
 		return;
-		
+
 	if(first){
 		fmtinstall('T', timefmt);
 		first = 0;
 	}
-		
-	
+
 	qlock(&l->lk);
 	c = l->w;
 	n = c->ep - c->wp;
@@ -227,10 +226,10 @@ void
 vtlogprint(VtLog *l, char *fmt, ...)
 {
 	va_list va, arg;
-	
+
 	if(l == nil)
 		return;
-		
+
 	va_start(va, fmt);
 	va_copy(arg, va);
 	va_end(va);
@@ -263,7 +262,7 @@ vtlogdump(int fd, VtLog *l)
 
 	if(l == nil)
 		return;
-		
+
 	c = l->w;
 	for(i=0; i<l->nchunk; i++){
 		if(++c == l->chunk+l->nchunk)