__PHYSFS_platformDeinit() should return void.
What are you going to do if this fails, anyhow?
This commit is contained in:
parent
248167af40
commit
61bdee4d78
|
@ -1362,8 +1362,7 @@ static int doDeinit(void)
|
||||||
|
|
||||||
errorLock = stateLock = NULL;
|
errorLock = stateLock = NULL;
|
||||||
|
|
||||||
/* !!! FIXME: what on earth are you supposed to do if this fails? */
|
__PHYSFS_platformDeinit();
|
||||||
BAIL_IF_ERRPASS(!__PHYSFS_platformDeinit(), 0);
|
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
} /* doDeinit */
|
} /* doDeinit */
|
||||||
|
|
|
@ -431,11 +431,8 @@ int __PHYSFS_platformInit(void);
|
||||||
* Deinitialize the platform. This is called when PHYSFS_deinit() is called
|
* Deinitialize the platform. This is called when PHYSFS_deinit() is called
|
||||||
* from the application. You can use this to clean up anything you've
|
* from the application. You can use this to clean up anything you've
|
||||||
* allocated in your platform driver.
|
* allocated in your platform driver.
|
||||||
*
|
|
||||||
* Return zero if there was a catastrophic failure (which prevents you from
|
|
||||||
* functioning at all), and non-zero otherwise.
|
|
||||||
*/
|
*/
|
||||||
int __PHYSFS_platformDeinit(void);
|
void __PHYSFS_platformDeinit(void);
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -32,9 +32,9 @@ int __PHYSFS_platformInit(void)
|
||||||
} /* __PHYSFS_platformInit */
|
} /* __PHYSFS_platformInit */
|
||||||
|
|
||||||
|
|
||||||
int __PHYSFS_platformDeinit(void)
|
void __PHYSFS_platformDeinit(void)
|
||||||
{
|
{
|
||||||
return 1; /* always succeed. */
|
/* no-op */
|
||||||
} /* __PHYSFS_platformDeinit */
|
} /* __PHYSFS_platformDeinit */
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -27,9 +27,9 @@ int __PHYSFS_platformInit(void)
|
||||||
} /* __PHYSFS_platformInit */
|
} /* __PHYSFS_platformInit */
|
||||||
|
|
||||||
|
|
||||||
int __PHYSFS_platformDeinit(void)
|
void __PHYSFS_platformDeinit(void)
|
||||||
{
|
{
|
||||||
return 1; /* always succeed. */
|
/* no-op */
|
||||||
} /* __PHYSFS_platformDeinit */
|
} /* __PHYSFS_platformDeinit */
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -271,7 +271,7 @@ int __PHYSFS_platformInit(void)
|
||||||
} /* __PHYSFS_platformInit */
|
} /* __PHYSFS_platformInit */
|
||||||
|
|
||||||
|
|
||||||
int __PHYSFS_platformDeinit(void)
|
void __PHYSFS_platformDeinit(void)
|
||||||
{
|
{
|
||||||
if (uconvdll)
|
if (uconvdll)
|
||||||
{
|
{
|
||||||
|
@ -280,8 +280,6 @@ int __PHYSFS_platformDeinit(void)
|
||||||
DosFreeModule(uconvdll);
|
DosFreeModule(uconvdll);
|
||||||
uconvdll = 0;
|
uconvdll = 0;
|
||||||
} /* if */
|
} /* if */
|
||||||
|
|
||||||
return 1; /* success. */
|
|
||||||
} /* __PHYSFS_platformDeinit */
|
} /* __PHYSFS_platformDeinit */
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -65,9 +65,9 @@ int __PHYSFS_platformInit(void)
|
||||||
} /* __PHYSFS_platformInit */
|
} /* __PHYSFS_platformInit */
|
||||||
|
|
||||||
|
|
||||||
int __PHYSFS_platformDeinit(void)
|
void __PHYSFS_platformDeinit(void)
|
||||||
{
|
{
|
||||||
return 1; /* always succeed. */
|
/* no-op */
|
||||||
} /* __PHYSFS_platformDeinit */
|
} /* __PHYSFS_platformDeinit */
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -612,10 +612,9 @@ int __PHYSFS_platformInit(void)
|
||||||
} /* __PHYSFS_platformInit */
|
} /* __PHYSFS_platformInit */
|
||||||
|
|
||||||
|
|
||||||
int __PHYSFS_platformDeinit(void)
|
void __PHYSFS_platformDeinit(void)
|
||||||
{
|
{
|
||||||
deinitCDThread();
|
deinitCDThread();
|
||||||
return 1; /* It's all good */
|
|
||||||
} /* __PHYSFS_platformDeinit */
|
} /* __PHYSFS_platformDeinit */
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue