Module Name: src
Committed By: christos
Date: Wed Jul 29 18:23:32 UTC 2015
Modified Files:
src/usr.bin/xlint/lint1: tree.c
Log Message:
Make the return type of "? type1 : void *" or "? void * : type1" to be type1
instead of void *.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.79 src/usr.bin/xlint/lint1/tree.c:1.80
--- src/usr.bin/xlint/lint1/tree.c:1.79 Wed Jul 29 14:22:06 2015
+++ src/usr.bin/xlint/lint1/tree.c Wed Jul 29 14:23:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.79 2015/07/29 18:22:06 christos Exp $ */
+/* $NetBSD: tree.c,v 1.80 2015/07/29 18:23:32 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.79 2015/07/29 18:22:06 christos Exp $");
+__RCSID("$NetBSD: tree.c,v 1.80 2015/07/29 18:23:32 christos Exp $");
#endif
#include <stdlib.h>
@@ -2534,12 +2534,12 @@ bldcol(tnode_t *ln, tnode_t *rn)
} else if (lt == PTR && ln->tn_type->t_subt->t_tspec == VOID) {
if (rt != PTR)
LERROR("bldcol()");
- rtp = ln->tn_type;
+ rtp = rn->tn_type;
mrgqual(&rtp, ln->tn_type, rn->tn_type);
} else if (rt == PTR && rn->tn_type->t_subt->t_tspec == VOID) {
if (lt != PTR)
LERROR("bldcol()");
- rtp = rn->tn_type;
+ rtp = ln->tn_type;
mrgqual(&rtp, ln->tn_type, rn->tn_type);
} else {
if (lt != PTR || rt != PTR)
