10188 libast: cast between incompatible function types

Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>

3 files changed, 68 insertions, 55 deletions

diff --git a/usr/src/lib/libast/common/misc/glob.c b/usr/src/lib/libast/common/misc/glob.c
index 1a7a8bbe20..2bf92f30b9 100644
--- a/usr/src/lib/libast/common/misc/glob.c
+++ b/usr/src/lib/libast/common/misc/glob.c
@@ -564,6 +564,12 @@ skip:
 		gp->gl_error = GLOB_NOSPACE;
 }
 
+static void
+_closedir(void *ptr)
+{
+	(void) closedir(ptr);
+}
+
 int
 glob(const char* pattern, int flags, int (*errfn)(const char*, int), register glob_t* gp)
 {
@@ -627,7 +633,7 @@ glob(const char* pattern, int flags, int (*errfn)(const char*, int), register gl
 		{
 			gp->gl_opendir = (GL_opendir_f)opendir;
 			gp->gl_readdir = (GL_readdir_f)readdir;
-			gp->gl_closedir = (GL_closedir_f)closedir;
+			gp->gl_closedir = _closedir;
 			if (!gp->gl_stat)
 				gp->gl_stat = (GL_stat_f)pathstat;
 		}
diff --git a/usr/src/lib/libast/common/misc/mime.c b/usr/src/lib/libast/common/misc/mime.c
index 59b05068ac..2c8e4b33c1 100644
--- a/usr/src/lib/libast/common/misc/mime.c
+++ b/usr/src/lib/libast/common/misc/mime.c
@@ -84,7 +84,7 @@ typedef struct
  */
 
 static int
-lower(register int c)
+lower(int c)
 {
 	return isupper(c) ? tolower(c) : c;
 }
@@ -104,9 +104,9 @@ order(Dt_t* dt, void* a, void* b, Dtdisc_t* disc)
  */
 
 static void
-dropcap(register Cap_t* cap)
+dropcap(Cap_t* cap)
 {
-	register Att_t*	att;
+	Att_t*	att;
 
 	while (att = cap->att.next)
 	{
@@ -123,8 +123,8 @@ dropcap(register Cap_t* cap)
 static void
 drop(Dt_t* dt, void* object, Dtdisc_t* disc)
 {
-	register Ent_t*	ent = (Ent_t*)object;
-	register Cap_t*	cap;
+	Ent_t*	ent = (Ent_t*)object;
+	Cap_t*	cap;
 
 	while (cap = ent->cap)
 	{
@@ -139,14 +139,14 @@ drop(Dt_t* dt, void* object, Dtdisc_t* disc)
  */
 
 int
-mimeset(Mime_t* mp, register char* s, unsigned long flags)
+mimeset(Mime_t* mp, char* s, unsigned long flags)
 {
-	register Ent_t*	ent;
-	register Cap_t*	cap;
-	register Att_t*	att;
-	register char*	t;
-	register char*	v;
-	register char*	k;
+	Ent_t*	ent;
+	Cap_t*	cap;
+	Att_t*	att;
+	char*	t;
+	char*	v;
+	char*	k;
 	char*		x;
 	Att_t*		tta;
 	int		q;
@@ -242,8 +242,8 @@ mimeset(Mime_t* mp, register char* s, unsigned long flags)
 		{
 			if (ent)
 			{
-				register Cap_t*	dup;
-				register Cap_t*	pud;
+				Cap_t*	dup;
+				Cap_t*	pud;
 
 				for (pud = 0, dup = ent->cap; dup; pud = dup, dup = dup->next)
 					if (!cap->test && !dup->test || cap->test && dup->test && streq(cap->test, dup->test))
@@ -285,10 +285,10 @@ mimeset(Mime_t* mp, register char* s, unsigned long flags)
 int
 mimeload(Mime_t* mp, const char* file, unsigned long flags)
 {
-	register char*	s;
-	register char*	t;
-	register char*	e;
-	register int	n;
+	char*	s;
+	char*	t;
+	char*	e;
+	int	n;
 	Sfio_t*		fp;
 
 	if (!(s = (char*)file))
@@ -340,10 +340,10 @@ mimeload(Mime_t* mp, const char* file, unsigned long flags)
 static int
 list(Dt_t* dt, void* object, void* context)
 {
-	register Walk_t*	wp = (Walk_t*)context;
-	register Ent_t*		ent = (Ent_t*)object;
-	register Cap_t*		cap;
-	register Att_t*		att;
+	Walk_t*	wp = (Walk_t*)context;
+	Ent_t*		ent = (Ent_t*)object;
+	Cap_t*		cap;
+	Att_t*		att;
 
 	if (!wp->pattern || !strncasecmp(ent->name, wp->pattern, wp->prefix) && (!ent->name[wp->prefix] || ent->name[wp->prefix] == '/'))
 	{
@@ -377,12 +377,12 @@ list(Dt_t* dt, void* object, void* context)
 static Ent_t*
 find(Mime_t* mp, const char* type)
 {
-	register char*	lp;
-	register char*	rp;
-	register char*	rb;
-	register char*	rv;
-	register int	rc;
-	register int	i;
+	char*	lp;
+	char*	rp;
+	char*	rb;
+	char*	rv;
+	int	rc;
+	int	i;
 	char*		s;
 	Ent_t*		ent;
 	char		buf[256];
@@ -439,7 +439,7 @@ find(Mime_t* mp, const char* type)
  */
 
 int
-mimelist(Mime_t* mp, Sfio_t* fp, register const char* pattern)
+mimelist(Mime_t* mp, Sfio_t* fp, const char* pattern)
 {
 	Ent_t*	ent;
 	Walk_t	ws;
@@ -469,11 +469,11 @@ mimelist(Mime_t* mp, Sfio_t* fp, register const char* pattern)
  */
 
 static int
-arg(register Parse_t* pp, int first)
+arg(Parse_t* pp, int first)
 {
-	register char*	s;
-	register int	c;
-	register int	q;
+	char*	s;
+	int	c;
+	int	q;
 	int		x;
 
 	for (s = pp->next; isspace(*s) && *s != '\n'; s++);
@@ -547,10 +547,10 @@ arg(register Parse_t* pp, int first)
  */
 
 static char*
-expand(Mime_t* mp, register char* s, const char* name, const char* type, const char* opts)
+expand(Mime_t* mp, char* s, const char* name, const char* type, const char* opts)
 {
-	register char*	t;
-	register int	c;
+	char*	t;
+	int	c;
 	Parse_t		pp;
 
 	mp->disc->flags |= MIME_PIPE;
@@ -601,10 +601,10 @@ expand(Mime_t* mp, register char* s, const char* name, const char* type, const c
 char*
 mimeview(Mime_t* mp, const char* view, const char* name, const char* type, const char* opts)
 {
-	register Ent_t*	ent;
-	register Cap_t*	cap;
-	register Att_t*	att;
-	register char*	s;
+	Ent_t*	ent;
+	Cap_t*	cap;
+	Att_t*	att;
+	char*	s;
 	int		c;
 
 	if (ent = find(mp, type))
@@ -706,9 +706,9 @@ mimeview(Mime_t* mp, const char* view, const char* name, const char* type, const
  */
 
 int
-mimecmp(register const char* s, register const char* v, char** e)
+mimecmp(const char* s, const char* v, char** e)
 {
-	register int	n;
+	int	n;
 
 	while (isalnum(*v) || *v == *s && (*v == '_' || *v == '-' || *v == '/'))
 		if (n = lower(*s++) - lower(*v++))
@@ -722,15 +722,21 @@ mimecmp(register const char* s, register const char* v, char** e)
 	return lower(*s) - lower(*v);
 }
 
+static int
+_mimecmp(const char* s, const char* v)
+{
+	return (mimecmp(s, v, NULL));
+}
+
 /*
  * parse mime headers in strsearch(tab,num,siz) from s
  * return >0 if mime header consumed
  */
 
 int
-mimehead(Mime_t* mp, void* tab, size_t num, size_t siz, register char* s)
+mimehead(Mime_t* mp, void* tab, size_t num, size_t siz, char* s)
 {
-	register void*	p;
+	void*	p;
 	char*		e;
 	Parse_t		pp;
 	Mimevalue_f	set;
@@ -741,7 +747,7 @@ mimehead(Mime_t* mp, void* tab, size_t num, size_t siz, register char* s)
 	if (!strncasecmp(s, "content-", 8))
 	{
 		s += 8;
-		if ((p = strsearch(tab, num, siz, (Strcmp_f)mimecmp, s, &e)) && *e == ':')
+		if ((p = strsearch(tab, num, siz, _mimecmp, s, &e)) && *e == ':')
 		{
 			pp.next = e + 1;
 			if (arg(&pp, 1))
@@ -750,7 +756,7 @@ mimehead(Mime_t* mp, void* tab, size_t num, size_t siz, register char* s)
 					return 0;
 				while (arg(&pp, 0))
 					if (pp.value.size &&
-					    (p = strsearch(tab, num, siz, (Strcmp_f)mimecmp, pp.name.data, &e)) &&
+					    (p = strsearch(tab, num, siz, _mimecmp, pp.name.data, &e)) &&
 					    (*set)(mp, p, pp.value.data, pp.value.size, mp->disc))
 						return 0;
 				return 1;
@@ -769,7 +775,7 @@ mimehead(Mime_t* mp, void* tab, size_t num, size_t siz, register char* s)
 Mime_t*
 mimeopen(Mimedisc_t* disc)
 {
-	register Mime_t*	mp;
+	Mime_t*	mp;
 
 	if (!(mp = newof(0, Mime_t, 1, 0)))
 		return 0;
diff --git a/usr/src/lib/libast/common/string/strsearch.c b/usr/src/lib/libast/common/string/strsearch.c
index 8e7b6a2bc5..59a31d6f1a 100644
--- a/usr/src/lib/libast/common/string/strsearch.c
+++ b/usr/src/lib/libast/common/string/strsearch.c
@@ -39,19 +39,20 @@
 void*
 strsearch(const void* tab, size_t num, size_t siz, Strcmp_f comparf, const char* name, void* context)
 {
-	register char*		lo = (char*)tab;
-	register char*		hi = lo + (num - 1) * siz;
-	register char*		mid;
-	register int		v;
+	char*		lo = (char *)tab;
+	char*		hi = lo + (num - 1) * siz;
+	char*		mid;
+	int		v;
+	Strcmp_context_f comparf_c = (Strcmp_context_f)(uintptr_t)comparf;
 
 	while (lo <= hi)
 	{
 		mid = lo + (((hi - lo) / siz) / 2) * siz;
-		if (!(v = context ? (*(Strcmp_context_f)comparf)(name, *((char**)mid), context) : (*comparf)(name, *((char**)mid))))
-			return (void*)mid;
+		if (!(v = context ? (*comparf_c)(name, *((char**)mid), context) : (*comparf)(name, *((char**)mid))))
+			return (mid);
 		else if (v > 0)
 			lo = mid + siz;
 		else hi = mid - siz;
 	}
-	return 0;
+	return (NULL);
 }