summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2018-08-21 15:09:03 -0400
committerAdam Jackson <ajax@nwnk.net>2018-09-12 20:47:15 +0000
commit60ec8eadc370a9b06cc3f105974c0c6b8ad1bb4e (patch)
tree2f7188c0c2cca831b0e9c35d3e8c75bb7069ccd8 /hw
parenta41ccaa0857146e986f11360d4f2aeb3913af9a6 (diff)
xfree86: Remove unused xf86GetServerName()
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/common/xf86.h2
-rw-r--r--hw/xfree86/common/xf86Globals.c1
-rw-r--r--hw/xfree86/common/xf86Helper.c6
-rw-r--r--hw/xfree86/common/xf86Init.c5
-rw-r--r--hw/xfree86/doc/ddxDesign.xml9
5 files changed, 0 insertions, 23 deletions
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 5743f0cd4..cb8190c95 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -287,8 +287,6 @@ extern _X_EXPORT Gamma
xf86GetGamma(void);
extern _X_EXPORT Bool
xf86GetFlipPixels(void);
-extern _X_EXPORT const char *
-xf86GetServerName(void);
extern _X_EXPORT Bool
xf86ServerIsExiting(void);
extern _X_EXPORT Bool
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 7cc7401a2..e08aa5bf1 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -168,7 +168,6 @@ const char *xf86VisualNames[] = {
};
/* Parameters set only from the command line */
-const char *xf86ServerName = "no-name";
Bool xf86fpFlag = FALSE;
Bool xf86sFlag = FALSE;
Bool xf86bsEnableFlag = FALSE;
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 95a90ad88..40ecf37bb 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1404,12 +1404,6 @@ xf86GetFlipPixels(void)
return xf86FlipPixels;
}
-const char *
-xf86GetServerName(void)
-{
- return xf86ServerName;
-}
-
Bool
xf86ServerIsExiting(void)
{
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 2ec15f027..8be36006e 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -330,11 +330,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
config_pre_init();
if (serverGeneration == 1) {
- if ((xf86ServerName = strrchr(argv[0], '/')) != 0)
- xf86ServerName++;
- else
- xf86ServerName = argv[0];
-
xf86PrintBanner();
LogPrintMarkers();
if (xf86LogFile) {
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index 367844136..8faf02b8a 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -1905,15 +1905,6 @@ functions:
</para></blockquote>
- <blockquote><para>
- <programlisting>
- const char *xf86GetServerName();
- </programlisting>
- <blockquote><para>
- Returns the name of the X server from the command line.
- </para></blockquote>
-
- </para></blockquote>
</sect2>
<sect2>