summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/client.c10
-rw-r--r--lib/draw/curses.c2
-rw-r--r--lib/filter.c12
-rw-r--r--lib/item.c6
-rw-r--r--lib/menu.c42
-rw-r--r--lib/util.c19
-rw-r--r--test/bmMenuNew.c2
7 files changed, 48 insertions, 45 deletions
diff --git a/client/client.c b/client/client.c
index df56511..973e57a 100644
--- a/client/client.c
+++ b/client/client.c
@@ -17,22 +17,22 @@ static ptrdiff_t getLine(char **outLine, size_t *outAllocated, FILE *stream)
size_t len = 0, allocated;
char *s, *buffer;
- assert(outLine != NULL);
- assert(outAllocated != NULL);
+ assert(outLine);
+ assert(outAllocated);
- if (stream == NULL || feof(stream) || ferror(stream))
+ if (!stream || feof(stream) || ferror(stream))
return -1;
allocated = *outAllocated;
buffer = *outLine;
- if (buffer == NULL || allocated == 0) {
+ if (!buffer || allocated == 0) {
if (!(buffer = calloc(1, (allocated = 1024) + 1)))
return -1;
}
for (s = buffer;;) {
- if (fgets(s, allocated - (s - buffer), stream) == NULL) {
+ if (!fgets(s, allocated - (s - buffer), stream)) {
*outAllocated = allocated;
*outLine = buffer;
return -1;
diff --git a/lib/draw/curses.c b/lib/draw/curses.c
index 5c6ff4a..3582be5 100644
--- a/lib/draw/curses.c
+++ b/lib/draw/curses.c
@@ -139,7 +139,7 @@ static void _bmDrawCursesEndWin(void)
static bmKey _bmDrawCursesGetKey(unsigned int *unicode)
{
- assert(unicode != NULL);
+ assert(unicode);
*unicode = 0;
if (!curses.stdscr)
diff --git a/lib/filter.c b/lib/filter.c
index b1cf668..d301415 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -17,9 +17,9 @@
*/
bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *count, unsigned int *selected)
{
- assert(menu != NULL);
- assert(count != NULL);
- assert(selected != NULL);
+ assert(menu);
+ assert(count);
+ assert(selected);
*count = *selected = 0;
/* FIXME: not real dmenu like filtering at all */
@@ -51,9 +51,9 @@ bmItem** _bmFilterDmenu(bmMenu *menu, unsigned int *count, unsigned int *selecte
*/
bmItem** _bmFilterDmenuCaseInsensitive(bmMenu *menu, unsigned int *count, unsigned int *selected)
{
- assert(menu != NULL);
- assert(count != NULL);
- assert(selected != NULL);
+ assert(menu);
+ assert(count);
+ assert(selected);
*count = *selected = 0;
/* FIXME: stub */
diff --git a/lib/item.c b/lib/item.c
index 40ebb52..beca6ed 100644
--- a/lib/item.c
+++ b/lib/item.c
@@ -31,7 +31,7 @@ bmItem* bmItemNew(const char *text)
*/
void bmItemFree(bmItem *item)
{
- assert(item != NULL);
+ assert(item);
if (item->text)
free(item->text);
@@ -47,7 +47,7 @@ void bmItemFree(bmItem *item)
*/
int bmItemSetText(bmItem *item, const char *text)
{
- assert(item != NULL);
+ assert(item);
char *copy = NULL;
if (text && !(copy = _bmStrdup(text)))
@@ -68,7 +68,7 @@ int bmItemSetText(bmItem *item, const char *text)
*/
const char* bmItemGetText(const bmItem *item)
{
- assert(item != NULL);
+ assert(item);
return item->text;
}
diff --git a/lib/menu.c b/lib/menu.c
index 5ea046a..ccdbf0d 100644
--- a/lib/menu.c
+++ b/lib/menu.c
@@ -15,7 +15,7 @@ static bmItem** (*filterFunc[BM_FILTER_MODE_LAST])(bmMenu *menu, unsigned int *c
static void _bmMenuFilter(bmMenu *menu)
{
- assert(menu != NULL);
+ assert(menu);
if (menu->filteredItems)
free(menu->filteredItems);
@@ -90,7 +90,7 @@ bmMenu* bmMenuNew(bmDrawMode drawMode)
*/
void bmMenuFree(bmMenu *menu)
{
- assert(menu != NULL);
+ assert(menu);
if (menu->renderApi.free)
menu->renderApi.free();
@@ -112,7 +112,7 @@ void bmMenuFree(bmMenu *menu)
*/
void bmMenuFreeItems(bmMenu *menu)
{
- assert(menu != NULL);
+ assert(menu);
unsigned int i;
for (i = 0; i < menu->itemsCount; ++i)
@@ -131,7 +131,7 @@ void bmMenuFreeItems(bmMenu *menu)
*/
void bmMenuSetFilterMode(bmMenu *menu, bmFilterMode mode)
{
- assert(menu != NULL);
+ assert(menu);
bmFilterMode oldMode = mode;
menu->filterMode = (mode >= BM_FILTER_MODE_LAST ? BM_FILTER_MODE_DMENU : mode);
@@ -148,7 +148,7 @@ void bmMenuSetFilterMode(bmMenu *menu, bmFilterMode mode)
*/
bmFilterMode bmMenuGetFilterMode(const bmMenu *menu)
{
- assert(menu != NULL);
+ assert(menu);
return menu->filterMode;
}
@@ -160,7 +160,7 @@ bmFilterMode bmMenuGetFilterMode(const bmMenu *menu)
*/
int bmMenuSetTitle(bmMenu *menu, const char *title)
{
- assert(menu != NULL);
+ assert(menu);
char *copy = NULL;
if (title && !(copy = _bmStrdup(title)))
@@ -181,7 +181,7 @@ int bmMenuSetTitle(bmMenu *menu, const char *title)
*/
const char* bmMenuGetTitle(const bmMenu *menu)
{
- assert(menu != NULL);
+ assert(menu);
return menu->title;
}
@@ -195,8 +195,8 @@ const char* bmMenuGetTitle(const bmMenu *menu)
*/
int bmMenuAddItemAt(bmMenu *menu, bmItem *item, unsigned int index)
{
- assert(menu != NULL);
- assert(item != NULL);
+ assert(menu);
+ assert(item);
if (menu->itemsCount >= menu->allocatedCount && !_bmMenuGrowItems(menu))
return 0;
@@ -232,7 +232,7 @@ int bmMenuAddItem(bmMenu *menu, bmItem *item)
*/
int bmMenuRemoveItemAt(bmMenu *menu, unsigned int index)
{
- assert(menu != NULL);
+ assert(menu);
unsigned int i = index;
if (i >= menu->itemsCount)
@@ -251,8 +251,8 @@ int bmMenuRemoveItemAt(bmMenu *menu, unsigned int index)
*/
int bmMenuRemoveItem(bmMenu *menu, bmItem *item)
{
- assert(menu != NULL);
- assert(item != NULL);
+ assert(menu);
+ assert(item);
unsigned int i;
for (i = 0; i < menu->itemsCount && menu->items[i] != item; ++i);
@@ -267,7 +267,7 @@ int bmMenuRemoveItem(bmMenu *menu, bmItem *item)
*/
bmItem* bmMenuGetSelectedItem(const bmMenu *menu)
{
- assert(menu != NULL);
+ assert(menu);
unsigned int count;
bmItem **items = bmMenuGetFilteredItems(menu, &count);
@@ -287,7 +287,7 @@ bmItem* bmMenuGetSelectedItem(const bmMenu *menu)
*/
bmItem** bmMenuGetItems(const bmMenu *menu, unsigned int *nmemb)
{
- assert(menu != NULL);
+ assert(menu);
if (nmemb)
*nmemb = menu->itemsCount;
@@ -307,7 +307,7 @@ bmItem** bmMenuGetItems(const bmMenu *menu, unsigned int *nmemb)
*/
bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *nmemb)
{
- assert(menu != NULL);
+ assert(menu);
if (nmemb)
*nmemb = (menu->filteredItems ? menu->filteredCount : menu->itemsCount);
@@ -326,9 +326,9 @@ bmItem** bmMenuGetFilteredItems(const bmMenu *menu, unsigned int *nmemb)
*/
int bmMenuSetItems(bmMenu *menu, const bmItem **items, unsigned int nmemb)
{
- assert(menu != NULL);
+ assert(menu);
- if (items == NULL || nmemb == 0) {
+ if (!items || nmemb == 0) {
bmMenuFreeItems(menu);
return 1;
}
@@ -353,7 +353,7 @@ int bmMenuSetItems(bmMenu *menu, const bmItem **items, unsigned int nmemb)
*/
void bmMenuRender(const bmMenu *menu)
{
- assert(menu != NULL);
+ assert(menu);
if (menu->renderApi.render)
menu->renderApi.render(menu);
@@ -370,8 +370,8 @@ void bmMenuRender(const bmMenu *menu)
*/
bmKey bmMenuGetKey(bmMenu *menu, unsigned int *unicode)
{
- assert(menu != NULL);
- assert(unicode != NULL);
+ assert(menu);
+ assert(unicode);
*unicode = 0;
bmKey key = BM_KEY_NONE;
@@ -390,7 +390,7 @@ bmKey bmMenuGetKey(bmMenu *menu, unsigned int *unicode)
*/
bmRunResult bmMenuRunWithKey(bmMenu *menu, bmKey key, unsigned int unicode)
{
- assert(menu != NULL);
+ assert(menu);
char *oldFilter = _bmStrdup(menu->filter);
unsigned int itemsCount = (menu->filteredItems ? menu->filteredCount : menu->itemsCount);
diff --git a/lib/util.c b/lib/util.c
index 8c9bc0f..d948b05 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -18,6 +18,8 @@
*/
char* _bmStrdup(const char *string)
{
+ assert(string);
+
size_t len = strlen(string);
if (len == 0)
return NULL;
@@ -41,6 +43,8 @@ char* _bmStrdup(const char *string)
*/
bmItem** _bmShrinkItemList(bmItem ***list, size_t osize, size_t nsize)
{
+ assert(list);
+
if (nsize >= osize)
return *list;
@@ -62,8 +66,7 @@ bmItem** _bmShrinkItemList(bmItem ***list, size_t osize, size_t nsize)
*/
int _bmUtf8StringScreenWidth(const char *string)
{
- if (!string)
- return 0;
+ assert(string);
int num_char = mbstowcs(NULL, string, 0) + 1;
wchar_t *wstring = malloc((num_char + 1) * sizeof (wstring[0]));
@@ -87,7 +90,7 @@ int _bmUtf8StringScreenWidth(const char *string)
*/
size_t _bmUtf8RuneNext(const char *string, size_t start)
{
- assert(string != NULL);
+ assert(string);
size_t len = strlen(string), i = start;
if (len == 0 || len <= i || !*string)
@@ -106,7 +109,7 @@ size_t _bmUtf8RuneNext(const char *string, size_t start)
*/
size_t _bmUtf8RunePrev(const char *string, size_t start)
{
- assert(string != NULL);
+ assert(string);
size_t len = strlen(string), i = start;
if (i == 0 || len < start || !*string)
@@ -125,7 +128,7 @@ size_t _bmUtf8RunePrev(const char *string, size_t start)
*/
size_t _bmUtf8RuneWidth(const char *rune, unsigned int u8len)
{
- assert(rune != NULL);
+ assert(rune);
char mb[5] = { 0, 0, 0, 0, 0 };
memcpy(mb, rune, (u8len > 4 ? 4 : u8len));
return _bmUtf8StringScreenWidth(mb);
@@ -141,7 +144,7 @@ size_t _bmUtf8RuneWidth(const char *rune, unsigned int u8len)
*/
size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *runeWidth)
{
- assert(string != NULL);
+ assert(string);
if (runeWidth)
*runeWidth = 0;
@@ -173,7 +176,7 @@ size_t _bmUtf8RuneRemove(char *string, size_t start, size_t *runeWidth)
*/
size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char *rune, unsigned int u8len, size_t *runeWidth)
{
- assert(string != NULL);
+ assert(string);
if (runeWidth)
*runeWidth = 0;
@@ -206,7 +209,7 @@ size_t _bmUtf8RuneInsert(char *string, size_t bufSize, size_t start, const char
*/
size_t _bmUnicodeInsert(char *string, size_t bufSize, size_t start, unsigned int unicode, size_t *runeWidth)
{
- assert(string != NULL);
+ assert(string);
char u8len = ((unicode < 0x80) ? 1 : ((unicode < 0x800) ? 2 : ((unicode < 0x10000) ? 3 : 4)));
char mb[5] = { 0, 0, 0, 0 };
diff --git a/test/bmMenuNew.c b/test/bmMenuNew.c
index e1b6161..ccb572d 100644
--- a/test/bmMenuNew.c
+++ b/test/bmMenuNew.c
@@ -11,7 +11,7 @@ int main(int argc, char **argv)
bmDrawMode i;
for (i = 0; i < BM_DRAW_MODE_LAST; ++i) {
bmMenu *menu = bmMenuNew(i);
- assert(menu != NULL);
+ assert(menu);
bmMenuRender(menu);
bmMenuFree(menu);
}
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-11-04 15:56:30 +0000