frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop xprint remnants: InitGlobals

This commit is contained in:
George Sapountzis 2008-01-03 17:53:56 +02:00
parent 641ce9c706
commit 255142b61e
13 changed files with 1 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dix/main.c
View File

@ -246,7 +246,6 @@ int main(int argc, char *argv[], char *envp[])
display = "0"; display = "0";
InitGlobals();
InitRegions(); InitRegions();
CheckUserParameters(argc, argv, envp); CheckUserParameters(argc, argv, envp);

7
hw/dmx/dmxinit.c
View File

@ -873,13 +873,6 @@ void OsVendorFatalError(void)
{ {
} }
/** This funciton is called by InitGlobals from Xserver/os/utils.c to
* initialize any ddx specific globals at a very early point in the
* server startup. */
void ddxInitGlobals(void)
{
}
/** Process our command line arguments. */ /** Process our command line arguments. */
int ddxProcessArgument(int argc, char *argv[], int i) int ddxProcessArgument(int argc, char *argv[], int i)
{ {

2
hw/kdrive/src/kdrive.c
View File

@ -1412,5 +1412,3 @@ DPMSSupported (void)
} }
#endif #endif
void ddxInitGlobals(void) { /* THANK YOU XPRINT */ }

5
hw/vfb/InitOutput.c
View File

@ -266,11 +266,6 @@ ddxUseMsg()
#endif #endif
} }
/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
void ddxInitGlobals(void)
{
}
int int
ddxProcessArgument(int argc, char *argv[], int i) ddxProcessArgument(int argc, char *argv[], int i)
{ {

5
hw/xfree86/common/xf86Init.c
View File

@ -1696,11 +1696,6 @@ ddxProcessArgument(int argc, char **argv, int i)
return xf86ProcessArgument(argc, argv, i); return xf86ProcessArgument(argc, argv, i);
} }
/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
void ddxInitGlobals(void)
{
}
/* /*
* ddxUseMsg -- * ddxUseMsg --
* Print out correct use of device dependent commandline options. * Print out correct use of device dependent commandline options.

4
hw/xgl/glx/xglxinit.c
View File

@ -166,7 +166,3 @@ OsVendorInit (void)
{ {
xglxOsVendorInit (); xglxOsVendorInit ();
} }
void ddxInitGlobals()
{
}

4
hw/xgl/xglinit.c
View File

@ -330,7 +330,3 @@ OsVendorInit (void)
if (xglEnsureDDXModule ()) if (xglEnsureDDXModule ())
(*__ddxFunc.osVendorInit) (); (*__ddxFunc.osVendorInit) ();
} }
void ddxInitGlobals()
{
}

10
hw/xnest/Args.c
View File

@ -49,16 +49,6 @@ int xnestNumScreens = 0;
Bool xnestDoDirectColormaps = False; Bool xnestDoDirectColormaps = False;
Window xnestParentWindow = 0; Window xnestParentWindow = 0;
/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
void ddxInitGlobals(void)
{
#ifdef COMPOSITE
/* XXX terrible hack */
extern Bool noCompositeExtension;
noCompositeExtension = TRUE;
#endif
}
int int
ddxProcessArgument (int argc, char *argv[], int i) ddxProcessArgument (int argc, char *argv[], int i)
{ {

9
hw/xquartz/darwin.c
View File

@ -677,15 +677,6 @@ void OsVendorInit(void)
} }
/*
* ddxInitGlobals
* Called by InitGlobals() from os/util.c.
*/
void ddxInitGlobals(void)
{
}
/* /*
* ddxProcessArgument * ddxProcessArgument
* Process device-dependent command line args. Returns 0 if argument is * Process device-dependent command line args. Returns 0 if argument is

5
hw/xwin/InitOutput.c
View File

@ -920,11 +920,6 @@ ddxUseMsg(void)
MB_ICONINFORMATION); MB_ICONINFORMATION);
} }
/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
void ddxInitGlobals(void)
{
}
/* See Porting Layer Definition - p. 20 */ /* See Porting Layer Definition - p. 20 */
/* /*
* Do any global initialization, then initialize each screen. * Do any global initialization, then initialize each screen.

4
include/os.h
View File

@ -212,8 +212,6 @@ extern SIGVAL GiveUp(int /*sig*/);
extern void UseMsg(void); extern void UseMsg(void);
extern void InitGlobals(void);
extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]); extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
extern int set_font_authorizations( extern int set_font_authorizations(
@ -411,8 +409,6 @@ extern XID GenerateAuthorization(
extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/); extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/);
#endif #endif
extern void ddxInitGlobals(void);
extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/); extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
extern void ddxUseMsg(void); extern void ddxUseMsg(void);

1
mi/miinitext.c
View File

@ -59,6 +59,7 @@ SOFTWARE.
#ifdef HAVE_XNEST_CONFIG_H #ifdef HAVE_XNEST_CONFIG_H
#include <xnest-config.h> #include <xnest-config.h>
#undef COMPOSITE
#undef DPMSExtension #undef DPMSExtension
#endif #endif

11
os/utils.c
View File

@ -659,17 +659,6 @@ VerifyDisplayName(const char *d)
return( 1 ); return( 1 );
} }
/*
* This function is responsible for doing initalisation of any global
* variables at an very early point of server startup (even before
* |ProcessCommandLine()|.
*/
void InitGlobals(void)
{
ddxInitGlobals();
}
/* /*
* This function parses the command line. Handles device-independent fields * This function parses the command line. Handles device-independent fields
* and allows ddx to handle additional fields. It is not allowed to modify * and allows ddx to handle additional fields. It is not allowed to modify