diff options
| author | Jonathan Bradley <jcb@pikum.xyz> | 2024-11-05 19:05:36 -0500 |
|---|---|---|
| committer | Jonathan Bradley <jcb@pikum.xyz> | 2024-11-05 19:05:36 -0500 |
| commit | 06677d6aa1d477253e65015101d1185e74ee8054 (patch) | |
| tree | dd39f42f4f6b88de34efe4f03a6219df4e72361f | |
| parent | d65e59e328d36994e0271b369780244b62e8654e (diff) | |
pk.h: cleanup and include errors
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | pkmem-types.h | 6 | ||||
| -rw-r--r-- | test/pkmem-types.c | 2 |
3 files changed, 7 insertions, 5 deletions
@@ -75,13 +75,15 @@ build: pkmem-types build: pkmem build: pkstr build: pkev + echo "#ifndef PK_SINGLE_HEADER_FILE_H\n#define PK_SINGLE_HEADER_FILE_H" > pk.h cat pk.h.in \ pkmacros.h \ pkmem-types.h \ pkmem.h \ pkstr.h \ pkev.h \ - > pk.h + >> pk.h + echo "#endif /* PK_SINGLE_HEADER_FILE_H */" >> pk.h sed -i -r \ -e "s/@@PK_VERSION@@/$(VERSION)/g" \ -e "s/@@YEAR@@/`date -u +%Y`/g" \ diff --git a/pkmem-types.h b/pkmem-types.h index 2e96433..b3840cd 100644 --- a/pkmem-types.h +++ b/pkmem-types.h @@ -18,7 +18,7 @@ struct pk_handle { pk_handle_item_index_T itemIndex; }; -const struct pk_handle pk_handle_MAX = (struct pk_handle){ .bucketIndex = 0xFFFFFFFF, .itemIndex = 0xFFFFFFFF }; +#define PK_HANDLE_MAX ((struct pk_handle){ .bucketIndex = 0xFFFFFFFF, .itemIndex = 0xFFFFFFFF }) enum PK_HANDLE_VALIDATION pk_handle_validate(const struct pk_handle handle, const struct pk_handle bucketHandle, const uint64_t maxItems); @@ -55,10 +55,10 @@ struct pk_membucket; #ifdef PK_IMPL_MEM_TYPES -enum PK_HANDLE_VALIDATION +inline enum PK_HANDLE_VALIDATION pk_handle_validate(const struct pk_handle handle, const struct pk_handle bucketHandle, const uint64_t maxItems) { - if (handle.bucketIndex == pk_handle_MAX.bucketIndex && handle.itemIndex == pk_handle_MAX.itemIndex) + if (handle.bucketIndex == PK_HANDLE_MAX.bucketIndex && handle.itemIndex == PK_HANDLE_MAX.itemIndex) return PK_HANDLE_VALIDATION_VALUE_MAX; if (handle.bucketIndex > bucketHandle.bucketIndex) return PK_HANDLE_VALIDATION_BUCKET_INDEX_TOO_HIGH; diff --git a/test/pkmem-types.c b/test/pkmem-types.c index 2399308..a6f0174 100644 --- a/test/pkmem-types.c +++ b/test/pkmem-types.c @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) res = pk_handle_validate(h, bh, 1024); PK_LOGV_INF("pk_handle_validate 002: %i\n", res); - h = pk_handle_MAX; + h = PK_HANDLE_MAX; res = pk_handle_validate(h, bh, 1024); PK_LOGV_INF("pk_handle_validate 003: %i\n", res); } |