mirror of
https://github.com/fadden/nulib2.git
synced 2024-06-08 19:29:31 +00:00
Updated for new callback setter return type.
This commit is contained in:
parent
e9b4107d2f
commit
f75f26b69b
|
@ -757,77 +757,94 @@ NuIsPresizedThreadID(NuThreadID threadID)
|
||||||
* ===========================================================================
|
* ===========================================================================
|
||||||
*/
|
*/
|
||||||
|
|
||||||
NUFXLIB_API NuError
|
NUFXLIB_API NuCallback
|
||||||
NuSetSelectionFilter(NuArchive* pArchive, NuCallback filterFunc)
|
NuSetSelectionFilter(NuArchive* pArchive, NuCallback filterFunc)
|
||||||
{
|
{
|
||||||
NuError err;
|
NuError err;
|
||||||
|
NuCallback oldFunc = kNuInvalidCallback;
|
||||||
|
|
||||||
/*Assert(!((ulong)filterFunc % 4));*/
|
/*Assert(!((ulong)filterFunc % 4));*/
|
||||||
|
|
||||||
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone)
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
||||||
|
oldFunc = pArchive->selectionFilterFunc;
|
||||||
pArchive->selectionFilterFunc = filterFunc;
|
pArchive->selectionFilterFunc = filterFunc;
|
||||||
|
}
|
||||||
|
|
||||||
return err;
|
return oldFunc;
|
||||||
}
|
}
|
||||||
|
|
||||||
NUFXLIB_API NuError
|
NUFXLIB_API NuCallback
|
||||||
NuSetOutputPathnameFilter(NuArchive* pArchive, NuCallback filterFunc)
|
NuSetOutputPathnameFilter(NuArchive* pArchive, NuCallback filterFunc)
|
||||||
{
|
{
|
||||||
NuError err;
|
NuError err;
|
||||||
|
NuCallback oldFunc = kNuInvalidCallback;
|
||||||
|
|
||||||
/*Assert(!((ulong)filterFunc % 4));*/
|
/*Assert(!((ulong)filterFunc % 4));*/
|
||||||
|
|
||||||
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone)
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
||||||
|
oldFunc = pArchive->outputPathnameFunc;
|
||||||
pArchive->outputPathnameFunc = filterFunc;
|
pArchive->outputPathnameFunc = filterFunc;
|
||||||
|
}
|
||||||
|
|
||||||
return err;
|
return oldFunc;
|
||||||
}
|
}
|
||||||
|
|
||||||
NUFXLIB_API NuError
|
NUFXLIB_API NuCallback
|
||||||
NuSetProgressUpdater(NuArchive* pArchive, NuCallback updateFunc)
|
NuSetProgressUpdater(NuArchive* pArchive, NuCallback updateFunc)
|
||||||
{
|
{
|
||||||
NuError err;
|
NuError err;
|
||||||
|
NuCallback oldFunc = kNuInvalidCallback;
|
||||||
|
|
||||||
/*Assert(!((ulong)updateFunc % 4));*/
|
/*Assert(!((ulong)updateFunc % 4));*/
|
||||||
|
|
||||||
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone)
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
||||||
|
oldFunc = pArchive->progressUpdaterFunc;
|
||||||
pArchive->progressUpdaterFunc = updateFunc;
|
pArchive->progressUpdaterFunc = updateFunc;
|
||||||
|
}
|
||||||
|
|
||||||
return err;
|
return oldFunc;
|
||||||
}
|
}
|
||||||
|
|
||||||
NUFXLIB_API NuError
|
NUFXLIB_API NuCallback
|
||||||
NuSetErrorHandler(NuArchive* pArchive, NuCallback errorFunc)
|
NuSetErrorHandler(NuArchive* pArchive, NuCallback errorFunc)
|
||||||
{
|
{
|
||||||
NuError err;
|
NuError err;
|
||||||
|
NuCallback oldFunc = kNuInvalidCallback;
|
||||||
|
|
||||||
/*Assert(!((ulong)errorFunc % 4));*/
|
/*Assert(!((ulong)errorFunc % 4));*/
|
||||||
|
|
||||||
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone)
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
||||||
|
oldFunc = pArchive->errorHandlerFunc;
|
||||||
pArchive->errorHandlerFunc = errorFunc;
|
pArchive->errorHandlerFunc = errorFunc;
|
||||||
|
}
|
||||||
|
|
||||||
return err;
|
return oldFunc;
|
||||||
}
|
}
|
||||||
|
|
||||||
NUFXLIB_API NuError
|
NUFXLIB_API NuCallback
|
||||||
NuSetErrorMessageHandler(NuArchive* pArchive, NuCallback messageHandlerFunc)
|
NuSetErrorMessageHandler(NuArchive* pArchive, NuCallback messageHandlerFunc)
|
||||||
{
|
{
|
||||||
NuError err;
|
NuError err;
|
||||||
|
NuCallback oldFunc = kNuInvalidCallback;
|
||||||
|
|
||||||
/*Assert(!((ulong)messageHandlerFunc % 4));*/
|
/*Assert(!((ulong)messageHandlerFunc % 4));*/
|
||||||
|
|
||||||
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone)
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
||||||
|
oldFunc = pArchive->messageHandlerFunc;
|
||||||
pArchive->messageHandlerFunc = messageHandlerFunc;
|
pArchive->messageHandlerFunc = messageHandlerFunc;
|
||||||
|
}
|
||||||
|
|
||||||
return err;
|
return oldFunc;
|
||||||
}
|
}
|
||||||
|
|
||||||
NUFXLIB_API NuError
|
NUFXLIB_API NuCallback
|
||||||
NuSetGlobalErrorMessageHandler(NuCallback messageHandlerFunc)
|
NuSetGlobalErrorMessageHandler(NuCallback messageHandlerFunc)
|
||||||
{
|
{
|
||||||
|
NuCallback oldFunc = kNuInvalidCallback;
|
||||||
/*Assert(!((ulong)messageHandlerFunc % 4));*/
|
/*Assert(!((ulong)messageHandlerFunc % 4));*/
|
||||||
|
|
||||||
|
oldFunc = gNuGlobalErrorMessageHandler;
|
||||||
gNuGlobalErrorMessageHandler = messageHandlerFunc;
|
gNuGlobalErrorMessageHandler = messageHandlerFunc;
|
||||||
return kNuErrNone;
|
return oldFunc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -540,16 +540,11 @@ CloseFunc(ExerciserState* pState, int argc, char** argv)
|
||||||
static NuError
|
static NuError
|
||||||
DeleteFunc(ExerciserState* pState, int argc, char** argv)
|
DeleteFunc(ExerciserState* pState, int argc, char** argv)
|
||||||
{
|
{
|
||||||
NuError err;
|
|
||||||
|
|
||||||
(void) pState, (void) argc, (void) argv; /* shut up, gcc */
|
(void) pState, (void) argc, (void) argv; /* shut up, gcc */
|
||||||
assert(ExerciserState_GetNuArchive(pState) != nil);
|
assert(ExerciserState_GetNuArchive(pState) != nil);
|
||||||
assert(argc == 1);
|
assert(argc == 1);
|
||||||
|
|
||||||
err = NuSetSelectionFilter(ExerciserState_GetNuArchive(pState),
|
NuSetSelectionFilter(ExerciserState_GetNuArchive(pState), SelectionFilter);
|
||||||
SelectionFilter);
|
|
||||||
if (err != kNuErrNone)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
return NuDelete(ExerciserState_GetNuArchive(pState));
|
return NuDelete(ExerciserState_GetNuArchive(pState));
|
||||||
}
|
}
|
||||||
|
@ -588,16 +583,11 @@ DeleteThreadFunc(ExerciserState* pState, int argc, char** argv)
|
||||||
static NuError
|
static NuError
|
||||||
ExtractFunc(ExerciserState* pState, int argc, char** argv)
|
ExtractFunc(ExerciserState* pState, int argc, char** argv)
|
||||||
{
|
{
|
||||||
NuError err;
|
|
||||||
|
|
||||||
(void) pState, (void) argc, (void) argv; /* shut up, gcc */
|
(void) pState, (void) argc, (void) argv; /* shut up, gcc */
|
||||||
assert(ExerciserState_GetNuArchive(pState) != nil);
|
assert(ExerciserState_GetNuArchive(pState) != nil);
|
||||||
assert(argc == 1);
|
assert(argc == 1);
|
||||||
|
|
||||||
err = NuSetSelectionFilter(ExerciserState_GetNuArchive(pState),
|
NuSetSelectionFilter(ExerciserState_GetNuArchive(pState), SelectionFilter);
|
||||||
SelectionFilter);
|
|
||||||
if (err != kNuErrNone)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
return NuExtract(ExerciserState_GetNuArchive(pState));
|
return NuExtract(ExerciserState_GetNuArchive(pState));
|
||||||
}
|
}
|
||||||
|
@ -926,7 +916,8 @@ SetErrorCallbackFunc(ExerciserState* pState, int argc, char** argv)
|
||||||
assert(ExerciserState_GetNuArchive(pState) != nil);
|
assert(ExerciserState_GetNuArchive(pState) != nil);
|
||||||
assert(argc == 1);
|
assert(argc == 1);
|
||||||
|
|
||||||
return NuSetErrorHandler(ExerciserState_GetNuArchive(pState), ErrorHandler);
|
NuSetErrorHandler(ExerciserState_GetNuArchive(pState), ErrorHandler);
|
||||||
|
return kNuErrNone;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -480,9 +480,10 @@ Test_Verify(NuArchive* pArchive)
|
||||||
|
|
||||||
printf("... verifying CRCs\n");
|
printf("... verifying CRCs\n");
|
||||||
|
|
||||||
err = NuSetSelectionFilter(pArchive, VerifySelectionCallback);
|
if (NuSetSelectionFilter(pArchive, VerifySelectionCallback) ==
|
||||||
if (err != kNuErrNone) {
|
kNuInvalidCallback)
|
||||||
fprintf(stderr, "ERROR: unable to set selection filter (err=%d)\n",err);
|
{
|
||||||
|
fprintf(stderr, "ERROR: unable to set selection filter\n");
|
||||||
goto failed;
|
goto failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -982,9 +983,10 @@ DoTests(void)
|
||||||
fprintf(stderr, "ERROR: NuOpenRW failed (err=%d)\n", err);
|
fprintf(stderr, "ERROR: NuOpenRW failed (err=%d)\n", err);
|
||||||
goto failed;
|
goto failed;
|
||||||
}
|
}
|
||||||
err = NuSetErrorMessageHandler(pArchive, ErrorMessageHandler);
|
if (NuSetErrorMessageHandler(pArchive, ErrorMessageHandler) ==
|
||||||
if (err != kNuErrNone) {
|
kNuInvalidCallback)
|
||||||
fprintf(stderr, "ERROR: couldn't set message handler (err=%d)\n", err);
|
{
|
||||||
|
fprintf(stderr, "ERROR: couldn't set message handler\n");
|
||||||
goto failed;
|
goto failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1017,9 +1019,10 @@ DoTests(void)
|
||||||
fprintf(stderr, "ERROR: NuOpenRO failed (err=%d)\n", err);
|
fprintf(stderr, "ERROR: NuOpenRO failed (err=%d)\n", err);
|
||||||
goto failed;
|
goto failed;
|
||||||
}
|
}
|
||||||
err = NuSetErrorMessageHandler(pArchive, ErrorMessageHandler);
|
if (NuSetErrorMessageHandler(pArchive, ErrorMessageHandler) ==
|
||||||
if (err != kNuErrNone) {
|
kNuInvalidCallback)
|
||||||
fprintf(stderr, "ERROR: couldn't set message handler (err=%d)\n", err);
|
{
|
||||||
|
fprintf(stderr, "ERROR: couldn't set message handler\n");
|
||||||
goto failed;
|
goto failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1058,9 +1061,10 @@ DoTests(void)
|
||||||
fprintf(stderr, "ERROR: re-NuOpenRW failed (err=%d)\n", err);
|
fprintf(stderr, "ERROR: re-NuOpenRW failed (err=%d)\n", err);
|
||||||
goto failed;
|
goto failed;
|
||||||
}
|
}
|
||||||
err = NuSetErrorMessageHandler(pArchive, ErrorMessageHandler);
|
if (NuSetErrorMessageHandler(pArchive, ErrorMessageHandler) ==
|
||||||
if (err != kNuErrNone) {
|
kNuInvalidCallback)
|
||||||
fprintf(stderr, "ERROR: couldn't set message handler (err=%d)\n", err);
|
{
|
||||||
|
fprintf(stderr, "ERROR: couldn't set message handler\n");
|
||||||
goto failed;
|
goto failed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1156,7 +1160,9 @@ main(void)
|
||||||
" %s with [%s]\n\n",
|
" %s with [%s]\n\n",
|
||||||
major, minor, bug, pBuildDate, pBuildFlags);
|
major, minor, bug, pBuildDate, pBuildFlags);
|
||||||
|
|
||||||
if (NuSetGlobalErrorMessageHandler(ErrorMessageHandler) != kNuErrNone) {
|
if (NuSetGlobalErrorMessageHandler(ErrorMessageHandler) ==
|
||||||
|
kNuInvalidCallback)
|
||||||
|
{
|
||||||
fprintf(stderr, "ERROR: can't set the global message handler");
|
fprintf(stderr, "ERROR: can't set the global message handler");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user