aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/InitOutput.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-28 08:09:17 +0000
committermarha <marha@users.sourceforge.net>2009-09-28 08:09:17 +0000
commit1f7d7f73b06b5add892a284bf563e3f01a60df52 (patch)
tree8ee80ff731e2eab418f4b7e1dc05173215ffac86 /xorg-server/hw/xwin/InitOutput.c
parent47989aafe4f7ac855d8969da28e1e0222dfe8f2b (diff)
downloadvcxsrv-1f7d7f73b06b5add892a284bf563e3f01a60df52.tar.gz
vcxsrv-1f7d7f73b06b5add892a284bf563e3f01a60df52.tar.bz2
vcxsrv-1f7d7f73b06b5add892a284bf563e3f01a60df52.zip
Removed most tracing in release versions.
Diffstat (limited to 'xorg-server/hw/xwin/InitOutput.c')
-rw-r--r--xorg-server/hw/xwin/InitOutput.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index ce5bc5f92..15cecbb3a 100644
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -215,9 +215,7 @@ ddxGiveUp (void)
{
int i;
-#if CYGDEBUG
winDebug ("ddxGiveUp\n");
-#endif
/* Perform per-screen deinitialization */
for (i = 0; i < g_iNumScreens; ++i)
@@ -289,9 +287,7 @@ ddxGiveUp (void)
void
AbortDDX (void)
{
-#if CYGDEBUG
winDebug ("AbortDDX\n");
-#endif
ddxGiveUp ();
}
@@ -375,8 +371,10 @@ winCheckMount(void)
return;
}
- if (!binary)
- winMsg(X_WARNING, "/tmp mounted int textmode\n");
+#ifdef WINDBG
+ if (!binary)
+ winDebug("/tmp mounted int textmode\n");
+#endif
}
#else
static void
@@ -611,7 +609,7 @@ winFixupPaths (void)
}
#endif /* RELOCATE_PROJECTROOT */
if (changed_fontpath)
- winMsg (font_from, "FontPath set to \"%s\"\n", defaultFontPath);
+ winDebug ("FontPath set to \"%s\"\n", defaultFontPath);
#ifdef RELOCATE_PROJECTROOT
if (getenv("XKEYSYMDB") == NULL)
@@ -672,7 +670,7 @@ winFixupPaths (void)
putenv(buffer);
} else
{
- winMsg (X_ERROR, "Can not determine HOME directory\n");
+ ErrorF ("Can not determine HOME directory\n");
}
if (shfolder != NULL)
FreeLibrary(shfolder);
@@ -687,7 +685,7 @@ winFixupPaths (void)
buffer[sizeof(buffer)-1] = 0;
g_pszLogFile = buffer;
GetLongPathName(buffer, buffer, MAX_PATH);
- winMsg (X_DEFAULT, "Logfile set to \"%s\"\n", g_pszLogFile);
+ winDebug ("Logfile set to \"%s\"\n", g_pszLogFile);
}
}
{
@@ -951,9 +949,7 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
/* Log the command line */
winLogCommandLine (argc, argv);
-#if CYGDEBUG
winDebug ("InitOutput\n");
-#endif
/* Validate command-line arguments */
if (serverGeneration == 1 && !winValidateArgs ())
@@ -974,7 +970,7 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
#ifdef XWIN_XF86CONFIG
/* Try to read the xorg.conf-style configuration file */
if (!winReadConfigfile ())
- winErrorFVerb (1, "InitOutput - Error reading config file\n");
+ ErrorF ("InitOutput - Error reading config file\n");
#else
winConfigFiles ();
#endif
@@ -1009,7 +1005,7 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
"_TrackMouseEvent");
if (g_fpTrackMouseEvent == NULL)
{
- winErrorFVerb (1, "InitOutput - Could not get pointer to function\n"
+ ErrorF ("InitOutput - Could not get pointer to function\n"
"\t_TrackMouseEvent in comctl32.dll. Try installing\n"
"\tInternet Explorer 3.0 or greater if you have not\n"
"\talready.\n");
@@ -1056,9 +1052,7 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
}
#endif
-#if CYGDEBUG || YES
winDebug ("InitOutput - Returning.\n");
-#endif
}