(install_service, info, apro) [_WIN32]: Convert to standard snprintf()

from _snprintf().

[_WIN32]: Add #define snprintf to convert to _snprintf for WIN32
Visual Studio.

diff --git a/include/misc.h b/include/misc.h
index ad118395267c68ca5a6c1978cc6c319ce76146a2..704bbf1af004b7203ccc7ae6169f2f377c48f083 100644 (file)
--- a/include/misc.h
+++ b/include/misc.h
@@ -60,6 +60,7 @@ typedef long ssize_t;
 
 typedef int pid_t;
 #define vsnprintf _vsnprintf
+#define snprintf _snprintf
 
 #endif /* _WIN32 */
 

diff --git a/src/lib/commands/info.c b/src/lib/commands/info.c
index ee5323c51b495645692b7187c384a10e773f4de0..783e7b8a6e2c7590e0cfdec26faf6f76f9c02002 100644 (file)
--- a/src/lib/commands/info.c
+++ b/src/lib/commands/info.c
@@ -304,7 +304,7 @@ info(void)
     if (!name || !*name)
        name = "TOP";
 
-    _snprintf(filename, sizeof(filename) - 1, "%s\\%s", infodir, name);
+    snprintf(filename, sizeof(filename) - 1, "%s\\%s", infodir, name);
     fp = fopen(filename, "rb");
     if (fp == NULL) {
        /* may be a "partial" request.  */
@@ -337,7 +337,7 @@ info(void)
                (strncasecmp(name, fData.cFileName, strlen(name)) == 0)) {
                nmatch++;
                if (nmatch == 1) {
-                   _snprintf(last, sizeof(last), "%s", fData.cFileName);
+                   snprintf(last, sizeof(last), "%s", fData.cFileName);
                } else {
                    if (nmatch == 2) {
                        pr("`%s' is ambiguous.  The following topics match:\n%s",
@@ -362,7 +362,7 @@ info(void)
            pr(".\n");
            return RET_FAIL;
        }
-       _snprintf(filename, sizeof(filename), "%s/%s",
+       snprintf(filename, sizeof(filename), "%s/%s",
                  infodir, last);
        fp = fopen(filename, "rb");
        if (fp == NULL) {
@@ -419,7 +419,7 @@ apro(void)
            lhitlim = 100;
     }
 
-    _snprintf(filename, sizeof(filename), "%s\\*",infodir);
+    snprintf(filename, sizeof(filename), "%s\\*",infodir);
     hDir = FindFirstFile(filename, &fData);
     if (hDir == INVALID_HANDLE_VALUE) {
        if (GetLastError() == ERROR_PATH_NOT_FOUND) {
@@ -452,7 +452,7 @@ apro(void)
            ((fData.dwFileAttributes == FILE_ATTRIBUTE_NORMAL) ||
             (fData.dwFileAttributes == FILE_ATTRIBUTE_ARCHIVE) ||
             (fData.dwFileAttributes == FILE_ATTRIBUTE_READONLY))) {
-           _snprintf(filename, sizeof(filename), "%s\\%s", infodir,
+           snprintf(filename, sizeof(filename), "%s\\%s", infodir,
                      fData.cFileName);
            fp = fopen(filename, "rb");
            alreadyhit = 0;

diff --git a/src/lib/gen/service.c b/src/lib/gen/service.c
index 8255f274574cbdeebdd519b0f4c695272f6a7c57..70ab73ba68f9cb591150bcbeaf30a50d6d145098 100644 (file)
--- a/src/lib/gen/service.c
+++ b/src/lib/gen/service.c
@@ -47,7 +47,7 @@ install_service(char *program_name, char *service_name, char *config_file)
     SERVICE_DESCRIPTION sdBuf;
 
     if (config_file != NULL)
-        _snprintf(&program_name[strlen(program_name)], _MAX_PATH-strlen(program_name), " -e %s",
+        snprintf(&program_name[strlen(program_name)], _MAX_PATH-strlen(program_name), " -e %s",
            config_file);
 
     if (service_name == NULL)