From c605a330aae55e88fb218036b629718ae68c9adf Mon Sep 17 00:00:00 2001 From: Daniel Lundqvist Date: Sat, 29 Mar 2025 12:58:37 +0100 Subject: [PATCH] Migrate configfile to containers.library. containers.library was previously called containerkit.library. Adapt to name change and API changes. --- configfile.c | 2 +- configfile.h | 2 +- configmodel.c | 6 +++--- containerkit.library | Bin 4272 -> 0 bytes containers.library | Bin 0 -> 6428 bytes containers/linearray.c | 8 ++++---- containers/linearray.h | 4 ++-- containers/sectionarray.c | 10 +++++----- containers/sectionarray.h | 4 ++-- containers/sectionmap.c | 6 +++--- containers/sectionmap.h | 2 +- containers/stringarray.c | 8 ++++---- containers/stringarray.h | 4 ++-- main.c | 12 ++++++------ sectionstore.c | 4 ++-- 15 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 containerkit.library create mode 100644 containers.library diff --git a/configfile.c b/configfile.c index 22f2e12..0989c79 100644 --- a/configfile.c +++ b/configfile.c @@ -200,7 +200,7 @@ BOOL ConfigFileSet(CONFIGFILEPTR abstractConfigFile, CONST_STRPTR compoundKey, C } else if( SizeOfArray(lines) == 1 ) { - LINEPTR line = (LINEPTR)ArrayBackValue(LINEPTR, lines); + LINEPTR line = (LINEPTR)ArrayBack(LINEPTR, lines); if( line ) { VARIABLEPTR var = VariableCreate(StringArrayValues(parts)[1], stringValue); diff --git a/configfile.h b/configfile.h index b49aea2..909c559 100644 --- a/configfile.h +++ b/configfile.h @@ -2,7 +2,7 @@ #define __CONFIGFILE_H #include #include -#include +#include typedef APTR CONFIGFILEPTR; // added the BPTR version so we can use WorkspaceOpenFile. diff --git a/configmodel.c b/configmodel.c index be95379..e690a60 100644 --- a/configmodel.c +++ b/configmodel.c @@ -609,7 +609,7 @@ StringArray CompoundKeySplitKeyCompletely(CONST_STRPTR key) { StringArrayAppendAndRetain(result, ""); StringArrayAppendAndRetain(result, ""); - StringArrayAppendAndRetain(result, (STRPTR)ArrayBackValue(STRPTR, parts)); + StringArrayAppendAndRetain(result, (STRPTR)ArrayBack(STRPTR, parts)); } else if( numberOfParts == 2 ) // section and variable ["section","","var"] { @@ -630,7 +630,7 @@ StringArray CompoundKeySplitKeyCompletely(CONST_STRPTR key) // start at index 1, and add (size -2 (start+end)) parts StringArrayAppend(result, StringArrayJoinedParts(parts, '.', 1, SizeOfArray(parts)-2)); - StringArrayAppendAndRetain(result, (STRPTR)ArrayBackValue(STRPTR, parts)); // variable + StringArrayAppendAndRetain(result, (STRPTR)ArrayBack(STRPTR, parts)); // variable } StringArrayFree(parts, TRUE); return result; @@ -664,7 +664,7 @@ StringArray CompoundKeySplitKeyForVar(CONST_STRPTR key) // now we join all but the last part sectionPart = StringArrayJoinedParts(parts, '.', 0, SizeOfArray(parts)-1); StringArrayAppend(result, sectionPart); // its been alloced so dont copy - varPart = (STRPTR)ArrayBackValue(STRPTR, parts); + varPart = (STRPTR)ArrayBack(STRPTR, parts); StringArrayAppendAndRetain(result, varPart); // its a reference so copy StringArrayFree(parts, TRUE); return result; diff --git a/containerkit.library b/containerkit.library deleted file mode 100644 index 1bcac3fc1ad68c299dc3610fda833e5a3dfd1fa0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4272 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 diff --git a/containers.library b/containers.library new file mode 100644 index 0000000000000000000000000000000000000000..d3637d0a913b8b13566662a87e474467ef79c4b7 GIT binary patch literal 6428 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 bIE5=?;TZtu&DV+m0zd_n0ZIY*6+QSr0{ld2 literal 0 HcmV?d00001 diff --git a/containers/linearray.c b/containers/linearray.c index 082bed6..52a9283 100644 --- a/containers/linearray.c +++ b/containers/linearray.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "linearray.h" #include "configmodel.h" @@ -13,8 +13,8 @@ LineArray LineArrayNew(VOID) { - #define SIZE_APTR 2 - return NewArray(SIZE_APTR); + #define SIZE_APTR 4 + return NewArray(SIZE_APTR, TAG_DONE); } VOID LineArrayAppend(LineArray array, LINEPTR value) @@ -44,7 +44,7 @@ VOID LineArrayFree(LineArray array, BOOL freeLines) LINEPTR* LineArrayValues(LineArray array) { - return ArrayValues(LINEPTR, array); + return ArrayElements(LINEPTR, array); } diff --git a/containers/linearray.h b/containers/linearray.h index 23ea8ad..1b2911e 100644 --- a/containers/linearray.h +++ b/containers/linearray.h @@ -3,8 +3,8 @@ #include #include "types.h" -#include -#include +#include +#include LineArray LineArrayNew(VOID); VOID LineArrayAppend(LineArray array, LINEPTR value); diff --git a/containers/sectionarray.c b/containers/sectionarray.c index 5e7fbd9..ea7b76e 100644 --- a/containers/sectionarray.c +++ b/containers/sectionarray.c @@ -4,10 +4,10 @@ #include "configmodel.h" -#define SIZE_APTR 2 +#define SIZE_APTR 4 SectionArray SectionArrayNew(VOID) { - return NewArray(SIZE_APTR); + return NewArray(SIZE_APTR, TAG_DONE); } VOID SectionArrayAppend(SectionArray array, SECTIONPTR value) @@ -29,13 +29,13 @@ VOID SectionArrayFree(SectionArray array, BOOL freeSections) SECTIONPTR* SectionArrayValues(SectionArray array) { - return ArrayValues(SECTIONPTR, array); + return ArrayElements(SECTIONPTR, array); } VariableArray VariableArrayNew(VOID) { - return NewArray(SIZE_APTR); + return NewArray(SIZE_APTR, TAG_DONE); } VOID VariableArrayAppend(VariableArray array, VARIABLEPTR value) @@ -57,6 +57,6 @@ VOID VariableArrayFree(VariableArray array, BOOL freeVars) VARIABLEPTR* VariableArrayValues(VariableArray array) { - return ArrayValues(VARIABLEPTR, array); + return ArrayElements(VARIABLEPTR, array); } diff --git a/containers/sectionarray.h b/containers/sectionarray.h index eef808e..516d9c1 100644 --- a/containers/sectionarray.h +++ b/containers/sectionarray.h @@ -2,8 +2,8 @@ #define __SECTIONARRAY_H #include "types.h" -#include -#include +#include +#include SectionArray SectionArrayNew(VOID); VOID SectionArrayAppend(SectionArray array, SECTIONPTR value); diff --git a/containers/sectionmap.c b/containers/sectionmap.c index edfb790..eb15e1d 100644 --- a/containers/sectionmap.c +++ b/containers/sectionmap.c @@ -3,9 +3,9 @@ SectionMap SectionMapNew() { - SectionMap result = NewMap(CNTKIT_KEY_STRING, - CNTKIT_CAPACITY, 8, - CNTKIT_VALUESIZE, 4, + SectionMap result = NewMap(CNT_KEY_STRING, + CNT_CAPACITY, 8, + CNT_VALUESIZE, 4, TAG_DONE); return result; diff --git a/containers/sectionmap.h b/containers/sectionmap.h index e058a96..a01b15b 100644 --- a/containers/sectionmap.h +++ b/containers/sectionmap.h @@ -2,7 +2,7 @@ #define __SECTIONMAP_H #include -#include +#include #include "configmodel.h" SectionMap SectionMapNew(VOID); diff --git a/containers/stringarray.c b/containers/stringarray.c index 1e7dcfb..058463d 100644 --- a/containers/stringarray.c +++ b/containers/stringarray.c @@ -1,6 +1,6 @@ #include "stringarray.h" -#include +#include #include #include @@ -8,8 +8,8 @@ #define MIN(x,y) (x -#include +#include +#include StringArray StringArrayNew(VOID); VOID StringArrayAppend(StringArray array, CONST_STRPTR value); diff --git a/main.c b/main.c index 40a3636..3da53b4 100644 --- a/main.c +++ b/main.c @@ -7,7 +7,7 @@ #include "containers/linearray.h" #include "configfile.h" #include "configmodel.h" -#include +#include WORD DoTheWork(STRPTR filename); VOID ProcessFile(BPTR configFile); @@ -15,12 +15,12 @@ VOID ProcessFile(BPTR configFile); char *vers="\0$VER: ConfigReader (dd.mm.yyyy)"; char *stacksize = "$STACK:8192"; // only works when started from CLI -struct Library *ContainerkitBase; +struct Library *ContainersBase; WORD DoTheWork(STRPTR filename) { WORD result = RETURN_OK; - if (ContainerkitBase) + if (ContainersBase) { CONFIGFILEPTR config = ConfigFileReadName(filename); if( config != NULL ) @@ -84,13 +84,13 @@ WORD main(WORD argc, STRPTR *argv) // end markers are "clean" and I can ensure I'm not leaking. Printf("\n"); - ContainerkitBase = OpenLibrary("containerkit.library", 1); - if( ContainerkitBase ) + ContainersBase = OpenLibrary("containers.library", 1); + if( ContainersBase ) { Printf("\n\nrunning (%ld bytes avail)\n\n", AvailMem(0)); result = DoTheWork(argv[1]); Printf("\n\ndone (%ld bytes avail)\n\n", AvailMem(0)); - CloseLibrary(ContainerkitBase); + CloseLibrary(ContainersBase); } else { diff --git a/sectionstore.c b/sectionstore.c index 545ccaf..94f4678 100644 --- a/sectionstore.c +++ b/sectionstore.c @@ -94,7 +94,7 @@ SECTIONPTR SectionStoreCurrentSection(SECTIONSTOREPTR abstractSectionStore) SECTIONPTR result = NULL; if( store != NULL && SizeOfArray(store->array) > 0 ) { - result = ArrayBackValue(SECTIONPTR, store->array); + result = ArrayBack(SECTIONPTR, store->array); } return result; } @@ -139,7 +139,7 @@ VARIABLEPTR SectionStoreGet(SECTIONSTOREPTR sectionStore, CONST_STRPTR canonical { VARIABLEPTR result = NULL; LineArray lines = SectionStoreFindLines(sectionStore, canonicalSectionName, varKey); - result = LineGetVariable((LINEPTR)ArrayBackValue(LINEPTR, lines)); + result = LineGetVariable((LINEPTR)ArrayBack(LINEPTR, lines)); LineArrayFree(lines, FALSE); return result; }