[pkgsrc/trunk]: pkgsrc/benchmarks/nettest Rename daemon to is_daemon, since d...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c314e03ba4b
branches:  trunk
changeset: 515042:3c314e03ba4b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jun 22 15:00:51 2006 +0000

description:
Rename daemon to is_daemon, since daemon is declared already in stdlib.h.

diffstat:

 benchmarks/nettest/distinfo         |   4 +-
 benchmarks/nettest/patches/patch-ad |  44 ++++++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 5 deletions(-)

diffs (86 lines):

diff -r d81db1aecb63 -r 3c314e03ba4b benchmarks/nettest/distinfo
--- a/benchmarks/nettest/distinfo       Thu Jun 22 14:51:44 2006 +0000
+++ b/benchmarks/nettest/distinfo       Thu Jun 22 15:00:51 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/06/21 14:27:28 minskim Exp $
+$NetBSD: distinfo,v 1.8 2006/06/22 15:00:51 joerg Exp $
 
 SHA1 (nettest.92.11.09.tar.Z) = 745408751115784f8f5dc63b16428eb1404d6c5e
 RMD160 (nettest.92.11.09.tar.Z) = dadf2688c5d57dc019df7267f35089e70a92bd79
@@ -6,4 +6,4 @@
 SHA1 (patch-aa) = 17f5b23a2813e46fa710e6fd810d5c6e7d9cb7b4
 SHA1 (patch-ab) = e96227451fce253cd77491cfa2214fa49651af15
 SHA1 (patch-ac) = 7c6f6abf3012c81d8898c4ef21936e0e89d108dd
-SHA1 (patch-ad) = bf34d0ccd2ed7eda77ff728d56513b7602ddee8a
+SHA1 (patch-ad) = bbae628cc8cb7a38f89f912d8682dc100fceeabc
diff -r d81db1aecb63 -r 3c314e03ba4b benchmarks/nettest/patches/patch-ad
--- a/benchmarks/nettest/patches/patch-ad       Thu Jun 22 14:51:44 2006 +0000
+++ b/benchmarks/nettest/patches/patch-ad       Thu Jun 22 15:00:51 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2006/06/21 14:27:28 minskim Exp $
+$NetBSD: patch-ad,v 1.6 2006/06/22 15:00:51 joerg Exp $
 
 --- nettestd.c.orig    1992-11-05 21:52:58.000000000 +0000
 +++ nettestd.c
@@ -10,6 +10,15 @@
  #ifdef        WAIT3CODE
  #include <sys/wait.h>
  #endif
+@@ -79,7 +80,7 @@ int  ipoptions = 0;
+ int   mesghdr = 0;
+ #define       debug(x)        if(dflag>1)fprintf x
+ int verbose;
+-int daemon = 0;               /* are we running in daemon mode? */
++int is_daemon = 0;            /* are we running in daemon mode? */
+ 
+ #ifdef        TCP_WINSHIFT
+ int   winshift;
 @@ -107,7 +108,12 @@ union {
  } name;
  int namesize;
@@ -24,10 +33,30 @@
  int (*rfunc)() = read;
  
  main(argc, argv)
-@@ -271,7 +277,11 @@ char **argv;
+@@ -139,7 +145,7 @@ char **argv;
+                                   "-v flag ignored when -b flag is used\n");
+                               verbose = 0;
+                       }
+-                      daemon++;
++                      is_daemon++;
+                       break;
+               case 'd':       /* turn on socket level debugging */
+                       ++dflag;
+@@ -204,7 +210,7 @@ char **argv;
+ #endif
+ 
+               case 'v':       /* print out errors in sequenced data */
+-                      if (daemon) {
++                      if (is_daemon) {
+                               fprintf(stderr,
+                                   "-v flag ignored when -b flag is used\n");
+                               verbose = 0;
+@@ -270,8 +276,12 @@ char **argv;
+ #  endif
  # endif
  #endif
-       if (daemon) {
+-      if (daemon) {
++      if (is_daemon) {
 +#ifdef NONVOID_SETPGRP
 +              if (setpgrp(0, getpid()) < 0)
 +#else
@@ -97,3 +126,12 @@
                                 &namesize);
                }
                if (t < 0) {
+@@ -758,7 +769,7 @@ usage()
+ error(string)
+ char *string;
+ {
+-      if (daemon)
++      if (is_daemon)
+               syslog(LOG_ERR, "nettestd: %s %m", string);
+       else
+               perror(string);