(commfil, comminit, make): Unused, remove.

diff --git a/include/optlist.h b/include/optlist.h
index 84d824d2d6c0dae5d0505a33f57728a19afed117..f8fddcc7e418f032a7ff2153d01eff890e460ba6 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -209,7 +209,6 @@ extern s_char *downfil;
 extern s_char *disablefil;
 extern s_char *banfil;
 extern s_char *authfil;
 extern s_char *disablefil;
 extern s_char *banfil;
 extern s_char *authfil;

-extern s_char *commfil;

 extern s_char *annfil;
 extern s_char *timestampfil;
 extern s_char *teldir;
 extern s_char *annfil;
 extern s_char *timestampfil;
 extern s_char *teldir;

diff --git a/src/lib/gen/emp_config.c b/src/lib/gen/emp_config.c
index 76bd18c7570cf6fe71eb175945b595ed63d8407b..e6e0561b091280af7bed59daaf45a63b5a882eaa 100644 (file)
--- a/src/lib/gen/emp_config.c
+++ b/src/lib/gen/emp_config.c
@@ -385,7 +385,6 @@ static struct otherfiles ofiles[] = {
     {&disablefil, "disable"},
     {&banfil, "ban"},
     {&authfil, "auth"},
     {&disablefil, "disable"},
     {&banfil, "ban"},
     {&authfil, "auth"},

-    {&commfil, "comm"},

     {&annfil, "ann"},
     {&timestampfil, "timestamp"},
     {&teldir, "tel"},
     {&annfil, "ann"},
     {&timestampfil, "timestamp"},
     {&teldir, "tel"},

diff --git a/src/lib/global/path.c b/src/lib/global/path.c
index 85c30700fd968401af2db2a01d91cf8b447ead8e..3f2ec9033f7df2b8506b7687c89f36575e1e8946 100644 (file)
--- a/src/lib/global/path.c
+++ b/src/lib/global/path.c
@@ -44,7 +44,6 @@ s_char *downfil = EMPDIR "/data/down";
 s_char *disablefil = EMPDIR "/data/disable";
 s_char *telfil = EMPDIR "/data/tel/tel";
 s_char *annfil = EMPDIR "/data/ann";
 s_char *disablefil = EMPDIR "/data/disable";
 s_char *telfil = EMPDIR "/data/tel/tel";
 s_char *annfil = EMPDIR "/data/ann";

-s_char *commfil = EMPDIR "/data/comm";

 s_char *banfil = EMPDIR "/data/ban";
 s_char *authfil = EMPDIR "/data/auth";
 s_char *timestampfil = EMPDIR "/data/timestamp";
 s_char *banfil = EMPDIR "/data/ban";
 s_char *authfil = EMPDIR "/data/auth";
 s_char *timestampfil = EMPDIR "/data/timestamp";

diff --git a/src/util/files.c b/src/util/files.c
index a670c912b8c3430d2fe206da0c2e0f71f924aa14..1fc86eb7753059e4d7aef39b3e40e551f80b5714 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -64,8 +64,6 @@
 #include "prototypes.h"
 #include "optlist.h"
 
 #include "prototypes.h"
 #include "optlist.h"
 

-static void comminit(int fd);
-static int make(char *filename);

 static void file_sct_init(coord x, coord y, s_char *ptr);
 
 int
 static void file_sct_init(coord x, coord y, s_char *ptr);
 
 int


@@ -153,7 +151,6 @@ main(int argc, char *argv[])
        putnat((&nat));
     }
     ef_close(EF_NATION);
        putnat((&nat));
     }
     ef_close(EF_NATION);

-    comminit(make(commfil));

 #if !defined(_WIN32)
     if (access(teldir, F_OK) < 0 && mkdir(teldir, 0750) < 0) {
 #else
 #if !defined(_WIN32)
     if (access(teldir, F_OK) < 0 && mkdir(teldir, 0750) < 0) {
 #else


@@ -197,58 +194,6 @@ main(int argc, char *argv[])
     exit(0);
 }
 
     exit(0);
 }
 

-static int
-make(char *filename)
-{
-    register int fd;
-
-#if !defined(_WIN32)
-    fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, 0600);
-#else
-    fd = open(filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0600);
-#endif
-    if (fd < 0)
-       printf("Creation of %s failed.\n", filename);
-    return fd;
-}
-
-
-/*
- * commodity trading file special initialization
- */
-float file_comm[MAXNOC][I_MAX + 1];
-float file_price[MAXNOC][I_MAX + 1];
-float file_mult[MAXNOC][MAXNOC];
-
-#if !defined(_WIN32)
-static struct iovec tradevec[3] = {
-    {(caddr_t)file_comm, sizeof(file_comm)}
-    ,
-    {(caddr_t)file_price, sizeof(file_price)}
-    ,
-    {(caddr_t)file_mult, sizeof(file_mult)}
-};
-#endif
-
-static void
-comminit(int fd)
-{
-    int i;
-    int j;
-
-    for (i = 0; i < MAXNOC; i++)
-       for (j = 0; j < MAXNOC; j++)
-           file_mult[i][j] = 1.0;
-#if !defined(_WIN32)
-    writev(fd, tradevec, 3);
-#else
-    write(fd, file_comm, sizeof(file_comm));
-    write(fd, file_price, sizeof(file_price));
-    write(fd, file_mult, sizeof(file_mult));
-#endif
-    close(fd);
-}
-

 static void
 file_sct_init(coord x, coord y, s_char *ptr)
 {
 static void
 file_sct_init(coord x, coord y, s_char *ptr)
 {