Fix the first arg to strscat so we can use stdarg macros and get this

to build on FreeBSD/Alpha.
This commit is contained in:
Steve Price 1999-09-20 02:12:51 +00:00
parent f392532992
commit 1d90b4b98c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=21804
4 changed files with 90 additions and 4 deletions

34
net-im/icb/files/patch-ad Normal file
View file

@ -0,0 +1,34 @@
--- icb/strings.c.orig Sun Sep 19 18:14:24 1999
+++ icb/strings.c Sun Sep 19 18:20:05 1999
@@ -3,7 +3,7 @@
#include "icb.h"
#include "externs.h"
-#include <varargs.h>
+#include <stdarg.h>
extern char *charmap;
@@ -334,19 +334,12 @@
/* call with strscat(dest, src, src, ...) */
char *
-strscat(va_alist)
-va_dcl
+strscat(char *dest, ...)
{
- char *dest, *src;
va_list args;
+ char *src;
- va_start(args);
-
- /* get the dest pointer */
- if ((dest = va_arg(args, char *)) == 0) {
- puts("fatal error: strscat called without dest");
- exit(-1);
- }
+ va_start(args, dest);
/* copy strings */
while ((src = va_arg(args, char *)) != NULL) {

View file

@ -1,5 +1,14 @@
--- icb/protos.h-orig Fri Feb 24 22:20:25 1995
+++ icb/protos.h Wed Apr 15 12:07:50 1998
--- icb/protos.h.orig Fri Feb 24 15:20:25 1995
+++ icb/protos.h Sun Sep 19 18:17:21 1999
@@ -15,7 +15,7 @@
char *idlestr(char *num);
char *nextword(char *s);
char *response(char *num);
-char *strscat(int va_alist,...);
+char *strscat(char *dest, ...);
char *tildexpand(char *s);
int addusage(char *name, int type, char *args, char *usage);
sighandler askquit();
@@ -64,7 +64,7 @@
int inserttab(void);
int ishushed(char *nick);

34
net/icb/files/patch-ad Normal file
View file

@ -0,0 +1,34 @@
--- icb/strings.c.orig Sun Sep 19 18:14:24 1999
+++ icb/strings.c Sun Sep 19 18:20:05 1999
@@ -3,7 +3,7 @@
#include "icb.h"
#include "externs.h"
-#include <varargs.h>
+#include <stdarg.h>
extern char *charmap;
@@ -334,19 +334,12 @@
/* call with strscat(dest, src, src, ...) */
char *
-strscat(va_alist)
-va_dcl
+strscat(char *dest, ...)
{
- char *dest, *src;
va_list args;
+ char *src;
- va_start(args);
-
- /* get the dest pointer */
- if ((dest = va_arg(args, char *)) == 0) {
- puts("fatal error: strscat called without dest");
- exit(-1);
- }
+ va_start(args, dest);
/* copy strings */
while ((src = va_arg(args, char *)) != NULL) {

View file

@ -1,5 +1,14 @@
--- icb/protos.h-orig Fri Feb 24 22:20:25 1995
+++ icb/protos.h Wed Apr 15 12:07:50 1998
--- icb/protos.h.orig Fri Feb 24 15:20:25 1995
+++ icb/protos.h Sun Sep 19 18:17:21 1999
@@ -15,7 +15,7 @@
char *idlestr(char *num);
char *nextword(char *s);
char *response(char *num);
-char *strscat(int va_alist,...);
+char *strscat(char *dest, ...);
char *tildexpand(char *s);
int addusage(char *name, int type, char *args, char *usage);
sighandler askquit();
@@ -64,7 +64,7 @@
int inserttab(void);
int ishushed(char *nick);