dix: Close protocol.txt after we're done loading extension names

Don't leave this file open during the whole server execution process;
close it once all of the extensions are initialized.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2014-09-10 15:04:00 -07:00
parent 9e07f3a3d2
commit a11fc2493e
3 changed files with 7 additions and 0 deletions

View File

@ -269,6 +269,8 @@ dix_main(int argc, char *argv[], char *envp[])
dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
dixCloseRegistry();
#ifdef PANORAMIX
if (!noPanoramiXExtension) {
if (!PanoramiXCreateConnectionBlock()) {

View File

@ -309,7 +309,11 @@ dixFreeRegistry(void)
resources = NULL;
nmajor = nevent = nerror = nresource = 0;
}
void
dixCloseRegistry(void)
{
if (fh) {
fclose(fh);
fh = NULL;

View File

@ -45,6 +45,7 @@ extern _X_EXPORT const char *LookupResourceName(RESTYPE rtype);
*/
extern _X_EXPORT void dixResetRegistry(void);
extern _X_EXPORT void dixFreeRegistry(void);
extern _X_EXPORT void dixCloseRegistry(void);
#else /* XREGISTRY */