From c9727c88298bbc5b579ba2c0fe01b9410b1ec45d Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Thu, 11 Nov 2021 17:33:02 +0300
Subject: [PATCH] shortened a few error messages

---
 glide2x/cvg/glide/src/gpci.c   | 8 +-------
 glide2x/h3/minihwc/minihwc.c   | 2 +-
 glide2x/sst1/glide/src/gpci.c  | 8 +-------
 glide3x/cvg/glide3/src/gpci.c  | 4 +---
 glide3x/h3/minihwc/minihwc.c   | 2 +-
 glide3x/h5/minihwc/minihwc.c   | 2 +-
 glide3x/sst1/glide3/src/gpci.c | 2 +-
 7 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/glide2x/cvg/glide/src/gpci.c b/glide2x/cvg/glide/src/gpci.c
index a514631..b1cb05d 100644
--- a/glide2x/cvg/glide/src/gpci.c
+++ b/glide2x/cvg/glide/src/gpci.c
@@ -815,13 +815,7 @@ _GlideInitEnvironment(void)
       const char* errStr = s;
       
       if (pciGetErrorCode() == PCI_ERR_NOERR) {
-#ifndef __linux__
-        sprintf(s, "%s: glide2x.dll expected %s, none detected\n",
-                FN_NAME, GLIDE_DRIVER_NAME);
-#else
-        sprintf(s, "%s: libglide2x.so expected %s, none detected\n",
-                FN_NAME, GLIDE_DRIVER_NAME);
-#endif
+        sprintf(s, "%s: expected %s, none detected\n", FN_NAME, GLIDE_DRIVER_NAME);
       } else {
         errStr = pciGetErrorString();
       }
diff --git a/glide2x/h3/minihwc/minihwc.c b/glide2x/h3/minihwc/minihwc.c
index 5e01a2b..ca24e55 100644
--- a/glide2x/h3/minihwc/minihwc.c
+++ b/glide2x/h3/minihwc/minihwc.c
@@ -881,7 +881,7 @@ hwcInit(FxU32 vID, FxU32 dID)
     }
     if (!hInfo.nBoards) {
       const char *error = pciGetErrorCode() ? pciGetErrorString() :
-                          "Voodoo Banshee or Voodoo3 not detected\n";
+                            "Voodoo3 or Banshee not detected\n";
       strcpy(errorString, error);
     }
   }
diff --git a/glide2x/sst1/glide/src/gpci.c b/glide2x/sst1/glide/src/gpci.c
index 78608e1..5b46c13 100644
--- a/glide2x/sst1/glide/src/gpci.c
+++ b/glide2x/sst1/glide/src/gpci.c
@@ -443,15 +443,9 @@ _GlideInitEnvironment( void )
   _GlideRoot.curGC = &_GlideRoot.GCs[0]; /* just for 'booting' the library */
   if (!_grSstDetectResources()) {
     char s[128];
-#ifndef __linux__
     sprintf(s,
-            "_GlideInitEnvironment: glide2x.dll expected %s, none detected\n",
+            "_GlideInitEnvironment: expected %s, none detected\n",
             GLIDE_DRIVER_NAME);
-#else
-    sprintf(s,
-            "_GlideInitEnvironment: libglide2x.so expected %s, none detected\n",
-            GLIDE_DRIVER_NAME);
-#endif
     GrErrorCallback(s, FXTRUE);
   }
 
diff --git a/glide3x/cvg/glide3/src/gpci.c b/glide3x/cvg/glide3/src/gpci.c
index 7ff4168..37569dd 100644
--- a/glide3x/cvg/glide3/src/gpci.c
+++ b/glide3x/cvg/glide3/src/gpci.c
@@ -806,8 +806,7 @@ _GlideInitEnvironment(void)
       const char* errStr = s;
       
       if (pciGetErrorCode() == PCI_ERR_NOERR) {
-        sprintf(s, "%s: glide3x.dll expected %s, none detected\n",
-                FN_NAME, GLIDE_DRIVER_NAME);
+        sprintf(s, "%s: expected %s, none detected\n", FN_NAME, GLIDE_DRIVER_NAME);
       } else {
         errStr = pciGetErrorString();
       }
@@ -828,4 +827,3 @@ _GlideInitEnvironment(void)
     _GlideRoot.initialized = hwDetectP;               /* save this for the end */
   }
 } /* _GlideInitEnvironment */
-
diff --git a/glide3x/h3/minihwc/minihwc.c b/glide3x/h3/minihwc/minihwc.c
index d1f6635..19884c3 100644
--- a/glide3x/h3/minihwc/minihwc.c
+++ b/glide3x/h3/minihwc/minihwc.c
@@ -1055,7 +1055,7 @@ hwcInit(FxU32 vID, FxU32 dID)
     }
     if (!hInfo.nBoards) {
       const char *error = pciGetErrorCode() ? pciGetErrorString() :
-                          "Voodoo Banshee or Voodoo3 not detected\n";
+                            "Voodoo3 or Banshee not detected\n";
       strcpy(errorString, error);
     }
   }
diff --git a/glide3x/h5/minihwc/minihwc.c b/glide3x/h5/minihwc/minihwc.c
index 826f711..ed46249 100644
--- a/glide3x/h5/minihwc/minihwc.c
+++ b/glide3x/h5/minihwc/minihwc.c
@@ -1780,7 +1780,7 @@ hwcInit(FxU32 vID, FxU32 dID)
     }
     if (!hInfo.nBoards) {
       const char *error = pciGetErrorCode() ? pciGetErrorString() :
-                          "Voodoo Banshee or Voodoo3/4/5 not detected\n";
+                            "Voodoo3/4/5 or Banshee not detected\n";
       strcpy(errorString, error);
     }
   }
diff --git a/glide3x/sst1/glide3/src/gpci.c b/glide3x/sst1/glide3/src/gpci.c
index c87be81..c9bc5fe 100644
--- a/glide3x/sst1/glide3/src/gpci.c
+++ b/glide3x/sst1/glide3/src/gpci.c
@@ -493,7 +493,7 @@ _GlideInitEnvironment( void )
   if (!_grSstDetectResources()) {
     char s[128];
     sprintf(s,
-            "_GlideInitEnvironment: glide3x.dll expected %s, none detected\n",
+            "_GlideInitEnvironment: expected %s, none detected\n",
             GLIDE_DRIVER_NAME);
     GrErrorCallback(s, FXTRUE);
   }