Skip to content

Use va_args-style variable argument lists instead of multiple named arguments. #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeanSturtevant1 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use va_args-style variable argument lists instead of multiple named arguments. #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08d04fa
Add missing include of <cstdlib> to fdrmode-bench.cc
DeanSturtevant1 Dec 4, 2025
d64f11e
Use va_args-style variable argument lists instead of named arguments.
DeanSturtevant1 Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions MicroBenchmarks/XRay/FDRMode/fdrmode-bench.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
#include <assert.h>
#include <fcntl.h>
#include <unistd.h>

#include <cstdlib>

#include "benchmark/benchmark.h"
#include "xray/xray_interface.h"
#include "xray/xray_log_interface.h"
Expand Down
7 changes: 5 additions & 2 deletions MultiSource/Benchmarks/MallocBench/make/make.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,11 @@ extern char *alloca ();
#endif

extern void die ();
extern void message (), fatal (), error ();
extern void makefile_error (), makefile_fatal ();
extern void message(const char* format, ...);
extern void fatal(const char* format, ...);
extern void error (const char* format, ...);
extern void makefile_error(const char* file, unsigned int lineno, const char* format, ...);
extern void makefile_fatal(const char* file, unsigned int lineno, const char* format, ...);
extern void pfatal_with_name (), perror_with_name ();
extern char *savestring (), *concat ();
extern char *xmalloc (), *xrealloc ();
Expand Down
57 changes: 32 additions & 25 deletions MultiSource/Benchmarks/MallocBench/make/misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "make.h"
#include "dep.h"
#include <errno.h>

#include <stdarg.h>
#include <stdio.h>

/* Compare strings *S1 and *S2.
Return negative if the first is less, positive if it is greater,
Expand Down Expand Up @@ -196,15 +197,18 @@ concat (s1, s2, s3)

/* Print a message on stdout. */

/* VARARGS1 */
void
message (s1, s2, s3, s4, s5, s6)
char *s1, *s2, *s3, *s4, *s5, *s6;
message (const char* format, ...)
{
if (makelevel == 0)
printf ("%s: ", program);
else
printf ("%s[%u]: ", program, makelevel);
printf (s1, s2, s3, s4, s5, s6);
va_list args;
va_start(args, format);
vprintf (format, args);
va_end(args);
putchar ('\n');
fflush (stdout);
}
Expand All @@ -213,14 +217,16 @@ message (s1, s2, s3, s4, s5, s6)

/* VARARGS1 */
void
fatal (s1, s2, s3, s4, s5, s6)
char *s1, *s2, *s3, *s4, *s5, *s6;
fatal (const char* format, ...)
{
if (makelevel == 0)
fprintf (stderr, "%s: ", program);
else
fprintf (stderr, "%s[%u]: ", program, makelevel);
fprintf (stderr, s1, s2, s3, s4, s5, s6);
va_list args;
va_start(args, format);
vfprintf (stderr, format, args);
va_end(args);
fputs (". Stop.\n", stderr);

die (1);
Expand All @@ -229,40 +235,41 @@ fatal (s1, s2, s3, s4, s5, s6)
/* Print error message. `s1' is printf control string, `s2' is arg for it. */

/* VARARGS1 */

void
error (s1, s2, s3, s4, s5, s6)
char *s1, *s2, *s3, *s4, *s5, *s6;
void error (const char* format, ...)
{
if (makelevel == 0)
fprintf (stderr, "%s: ", program);
else
fprintf (stderr, "%s[%u]: ", program, makelevel);
fprintf (stderr, s1, s2, s3, s4, s5, s6);
fprintf(stderr, "%s[%u]: ", program, makelevel);
va_list args;
va_start(args, format);
vfprintf (stderr, format, args);
va_end(args);
putc ('\n', stderr);
fflush (stderr);
}

void
makefile_error (file, lineno, s1, s2, s3, s4, s5, s6)
char *file;
unsigned int lineno;
char *s1, *s2, *s3, *s4, *s5, *s6;
void makefile_error(const char* file, unsigned int lineno, const char* format,
...)
{
fprintf (stderr, "%s:%u: ", file, lineno);
fprintf (stderr, s1, s2, s3, s4, s5, s6);
fprintf(stderr, "%s:%u: ", file, lineno);
va_list args;
va_start(args, format);
vfprintf(stderr, format, args);
va_end(args);
putc ('\n', stderr);
fflush (stderr);
}

/* VARARGS3 */
void
makefile_fatal (file, lineno, s1, s2, s3, s4, s5, s6)
char *file;
unsigned int lineno;
char *s1, *s2, *s3, *s4, *s5, *s6;
makefile_fatal (const char* file, unsigned int lineno, const char* format, ...)
{
fprintf (stderr, "%s:%u: ", file, lineno);
fprintf (stderr, s1, s2, s3, s4, s5, s6);
va_list args;
va_start(args, format);
vfprintf (stderr, format, args);
va_end(args);
fputs (". Stop.\n", stderr);

die (1);
Expand Down