From e938df873f029fdb4791bf2de8a8888b0a546af6 Mon Sep 17 00:00:00 2001 From: Alex 'AdUser' Z Date: Wed, 11 Jan 2017 18:30:07 +1000 Subject: [PATCH] * change simdb_usage_*() : use just 0x0 and 0x1 --- src/database.c | 4 ++-- src/simdb-query.c | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/database.c b/src/database.c index 2d7798a..be6b678 100644 --- a/src/database.c +++ b/src/database.c @@ -513,7 +513,7 @@ simdb_usage_map(simdb_t * const db, char ** const map) { break; r = data; for (int i = 0; i < ret; i++, m++, r++) { - *m = (r->used == 0xFF) ? CHAR_USED : CHAR_NONE; + *m = (r->used == 0xFF) ? 0x1 : 0x0; } FREE(data); } @@ -544,7 +544,7 @@ simdb_usage_slice(simdb_t * const db, char ** const map, int offset, int limit) r = data; for (int i = 0; i < limit; i++, m++, r++) { - *m = (r->used == 0xFF) ? CHAR_USED : CHAR_NONE; + *m = (r->used == 0xFF) ? 0x1 : 0x0; } FREE(data); diff --git a/src/simdb-query.c b/src/simdb-query.c index 44644b5..c1419d1 100644 --- a/src/simdb-query.c +++ b/src/simdb-query.c @@ -23,6 +23,9 @@ #include #include +#define CHAR_USED '@' +#define CHAR_FREE '-' + void usage(int exitcode) { fprintf(stderr, "Usage: simdb-query \n" @@ -85,8 +88,11 @@ int db_usage_map(simdb_t *db, unsigned short int cols) return 1; } + for (uint16_t i = 0; i < records; i++) + map[i] = map[i] ? CHAR_USED : CHAR_FREE; + if (cols == 0) { - putchar(CHAR_NONE); /* zero */ + putchar(CHAR_FREE); /* zero */ puts(map); FREE(map); return 0; @@ -111,6 +117,8 @@ int db_usage_slice(simdb_t *db, uint64_t offset, uint16_t limit) char *map = NULL; limit = simdb_usage_slice(db, &map, offset, limit); + for (uint16_t i = 0; i < limit; i++) + map[i] = map[i] ? CHAR_USED : CHAR_FREE; puts(map); FREE(map);