Module Name: src
Committed By: rillig
Date: Sun Aug 1 18:13:54 UTC 2021
Modified Files:
src/usr.bin/xlint/common: externs.h mem.c
src/usr.bin/xlint/xlint: xlint.c
Log Message:
lint: make xasprintf simpler
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/xlint/common/externs.h
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/xlint/common/mem.c
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/xlint/xlint/xlint.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/common/externs.h
diff -u src/usr.bin/xlint/common/externs.h:1.16 src/usr.bin/xlint/common/externs.h:1.17
--- src/usr.bin/xlint/common/externs.h:1.16 Sun Aug 1 18:07:35 2021
+++ src/usr.bin/xlint/common/externs.h Sun Aug 1 18:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: externs.h,v 1.16 2021/08/01 18:07:35 rillig Exp $ */
+/* $NetBSD: externs.h,v 1.17 2021/08/01 18:13:53 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -57,7 +57,7 @@ extern void *xmalloc(size_t);
extern void *xcalloc(size_t, size_t);
extern void *xrealloc(void *, size_t);
extern char *xstrdup(const char *);
-extern void xasprintf(char **, const char *, ...) __printflike(2, 3);
+extern char *xasprintf(const char *, ...) __printflike(1, 2);
/*
* emit.c
Index: src/usr.bin/xlint/common/mem.c
diff -u src/usr.bin/xlint/common/mem.c:1.14 src/usr.bin/xlint/common/mem.c:1.15
--- src/usr.bin/xlint/common/mem.c:1.14 Sun Aug 1 18:07:35 2021
+++ src/usr.bin/xlint/common/mem.c Sun Aug 1 18:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.14 2021/08/01 18:07:35 rillig Exp $ */
+/* $NetBSD: mem.c,v 1.15 2021/08/01 18:13:53 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem.c,v 1.14 2021/08/01 18:07:35 rillig Exp $");
+__RCSID("$NetBSD: mem.c,v 1.15 2021/08/01 18:13:53 rillig Exp $");
#endif
#include <stdarg.h>
@@ -82,8 +82,7 @@ xrealloc(void *p, size_t s)
free(p);
nomem();
}
- p = n;
- return p;
+ return n;
}
char *
@@ -96,15 +95,17 @@ xstrdup(const char *s)
return s2;
}
-void
-xasprintf(char **buf, const char *fmt, ...)
+char *
+xasprintf(const char *fmt, ...)
{
+ char *str;
int e;
va_list ap;
va_start(ap, fmt);
- e = vasprintf(buf, fmt, ap);
+ e = vasprintf(&str, fmt, ap);
va_end(ap);
if (e < 0)
nomem();
+ return str;
}
Index: src/usr.bin/xlint/xlint/xlint.c
diff -u src/usr.bin/xlint/xlint/xlint.c:1.63 src/usr.bin/xlint/xlint/xlint.c:1.64
--- src/usr.bin/xlint/xlint/xlint.c:1.63 Sun May 2 21:05:42 2021
+++ src/usr.bin/xlint/xlint/xlint.c Sun Aug 1 18:13:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xlint.c,v 1.63 2021/05/02 21:05:42 rillig Exp $ */
+/* $NetBSD: xlint.c,v 1.64 2021/08/01 18:13:53 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: xlint.c,v 1.63 2021/05/02 21:05:42 rillig Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.64 2021/08/01 18:13:53 rillig Exp $");
#endif
#include <sys/param.h>
@@ -696,9 +696,9 @@ fname(const char *name)
return;
}
len = bn == suff ? strlen(bn) : (size_t)((suff - 1) - bn);
- xasprintf(&ofn, "%.*s.ln", (int)len, bn);
+ ofn = xasprintf("%.*s.ln", (int)len, bn);
} else {
- xasprintf(&ofn, "%slint1.XXXXXX", tmpdir);
+ ofn = xasprintf("%slint1.XXXXXX", tmpdir);
fd = mkstemp(ofn);
if (fd == -1) {
warn("can't make temp");
