Commit b388fcbf authored by Mike Hibler's avatar Mike Hibler

Fix to remove malloc prototype conflict

parent 64ad3e5d
......@@ -344,7 +344,7 @@ diff -ru dist-tg2.0/src/tg/prot_udp.c tg2.0/src/tg/prot_udp.c
(void)close(sfd);
diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
--- dist-tg2.0/src/tg/tg.y Thu Jan 24 16:30:10 2002
+++ tg2.0/src/tg/tg.y Mon Jul 8 14:46:06 2002
+++ tg2.0/src/tg/tg.y Tue Jan 7 13:07:44 2003
@@ -133,7 +133,11 @@
char *version = "2.0"; /* TG program version. */
char *ofile = NULL;
......@@ -358,7 +358,15 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
/* Variables local to this file. */
@@ -856,6 +860,14 @@
@@ -265,7 +269,6 @@
macro
: IDENTIFIER EQUAL integer
{
- extern char *malloc();
char *cp;
if (!(cp = malloc (strlen($1.n) + 1))) {
@@ -856,6 +859,14 @@
void sigint();
FILE *fp;
......@@ -373,7 +381,7 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
/* Set debugging if it is desired. */
# if YYDEBUG
@@ -917,6 +929,7 @@
@@ -917,6 +928,7 @@
/* Generate traffic. */
do_actions();
......@@ -381,7 +389,7 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
return (0);
}
@@ -1005,7 +1018,7 @@
@@ -1005,7 +1017,7 @@
/* If there is no explicit setup clause, do an immediate setup. */
if (got_setup_implicit &&
......@@ -390,7 +398,7 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
{
/* log the setup error. */
@@ -1017,6 +1030,10 @@
@@ -1017,6 +1029,10 @@
/* Each pass through the following loop processes one tg_action */
/* element from the list. */
......@@ -401,7 +409,7 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
for (cur_tg = tg_first; cur_tg != NULL; cur_tg = cur_tg->next)
{
@@ -1070,7 +1087,7 @@
@@ -1070,7 +1086,7 @@
/* Perform setup phase. */
......@@ -410,7 +418,7 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
{
/* log the setup error. */
@@ -1116,7 +1133,7 @@
@@ -1116,7 +1132,7 @@
(*(prot.prot->sleep_till))(&(cur_tg->stop_before));
}
......@@ -419,7 +427,7 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
{
/* (Re-)Start logging to a new file */
time_t now;
@@ -1144,6 +1161,10 @@
@@ -1144,6 +1160,10 @@
generate(tx_asn, cur_tg, lasttime);
}
......@@ -430,7 +438,7 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
}
/* Finished, tear down connection. */
@@ -1154,8 +1175,11 @@
@@ -1154,8 +1174,11 @@
/* log the teardown error. */
perror("do_actions: protocol teardown");
......@@ -442,7 +450,7 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
return;
}
@@ -1341,6 +1365,12 @@
@@ -1341,6 +1364,12 @@
if (arrival != 0)
(*(prot.prot->sleep_till))(&nextpkt_tv);
......@@ -455,7 +463,7 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
lasttime = nextpkt_tv;
/* Did we exceed the limit on the number of packets to send? */
@@ -1382,6 +1412,10 @@
@@ -1382,6 +1411,10 @@
pktlen,
&(cur_tg->stop_before),
&pktid);
......@@ -466,7 +474,7 @@ diff -ru dist-tg2.0/src/tg/tg.y tg2.0/src/tg/tg.y
}
}
}
@@ -2096,5 +2130,16 @@
@@ -2096,5 +2129,16 @@
char *addr;
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment