From abd6ec6e468a067ea072fee9e8ba0303c1e95a2e Mon Sep 17 00:00:00 2001 From: Tim Wiederhake Date: Sat, 30 Dec 2023 20:49:48 +0100 Subject: Rename variable 'new' to 'entry' in splitEntry 'new' is a keyword in c++. Its usage confuses some tools that work with c and c++ source code. Signed-off-by: Tim Wiederhake --- src/icons.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/icons.c b/src/icons.c index 493eb7e..47ff670 100644 --- a/src/icons.c +++ b/src/icons.c @@ -50,7 +50,7 @@ static void mergeEntries(IconEntry *old, IconEntry *ie); static void splitEntry(IconEntry *ie, int grav1, int grav2, int w, int h) { - IconEntry *new; + IconEntry *entry; switch (grav1) { case D_NORTH: @@ -58,21 +58,21 @@ splitEntry(IconEntry *ie, int grav1, int grav2, int w, int h) if (w != ie->w) splitEntry(ie, grav2, grav1, w, ie->h); if (h != ie->h) { - new = malloc(sizeof(IconEntry)); - new->twm_win = 0; - new->used = 0; - new->next = ie->next; - ie->next = new; - new->x = ie->x; - new->h = (ie->h - h); - new->w = ie->w; + entry = malloc(sizeof(IconEntry)); + entry->twm_win = 0; + entry->used = 0; + entry->next = ie->next; + ie->next = entry; + entry->x = ie->x; + entry->h = (ie->h - h); + entry->w = ie->w; ie->h = h; if (grav1 == D_SOUTH) { - new->y = ie->y; - ie->y = new->y + new->h; + entry->y = ie->y; + ie->y = entry->y + entry->h; } else - new->y = ie->y + ie->h; + entry->y = ie->y + ie->h; } break; case D_EAST: @@ -80,21 +80,21 @@ splitEntry(IconEntry *ie, int grav1, int grav2, int w, int h) if (h != ie->h) splitEntry(ie, grav2, grav1, ie->w, h); if (w != ie->w) { - new = malloc(sizeof(IconEntry)); - new->twm_win = 0; - new->used = 0; - new->next = ie->next; - ie->next = new; - new->y = ie->y; - new->w = (ie->w - w); - new->h = ie->h; + entry = malloc(sizeof(IconEntry)); + entry->twm_win = 0; + entry->used = 0; + entry->next = ie->next; + ie->next = entry; + entry->y = ie->y; + entry->w = (ie->w - w); + entry->h = ie->h; ie->w = w; if (grav1 == D_EAST) { - new->x = ie->x; - ie->x = new->x + new->w; + entry->x = ie->x; + ie->x = entry->x + entry->w; } else - new->x = ie->x + ie->w; + entry->x = ie->x + ie->w; } break; } -- cgit v1.2.3