Skip to content

Commit f543aef

Browse files
committed
Use correct hashtable key type (ht_key_t) in Dynamic screen/meter code
No-op change in terms of generated code, but better to be consistent - thanks to BenBE for noticing this. Relates to #1702
1 parent 1cf2e67 commit f543aef

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

DynamicMeter.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void DynamicMeters_delete(Hashtable* dynamics) {
4848
}
4949

5050
typedef struct {
51-
unsigned int key;
51+
ht_key_t key;
5252
const char* name;
5353
bool found;
5454
} DynamicIterator;
@@ -62,7 +62,7 @@ static void DynamicMeter_compare(ht_key_t key, void* value, void* data) {
6262
}
6363
}
6464

65-
bool DynamicMeter_search(Hashtable* dynamics, const char* name, unsigned int* key) {
65+
bool DynamicMeter_search(Hashtable* dynamics, const char* name, ht_key_t* key) {
6666
DynamicIterator iter = { .key = 0, .name = name, .found = false };
6767
if (dynamics)
6868
Hashtable_foreach(dynamics, DynamicMeter_compare, &iter);
@@ -71,7 +71,7 @@ bool DynamicMeter_search(Hashtable* dynamics, const char* name, unsigned int* ke
7171
return iter.found;
7272
}
7373

74-
const char* DynamicMeter_lookup(Hashtable* dynamics, unsigned int key) {
74+
const char* DynamicMeter_lookup(Hashtable* dynamics, ht_key_t key) {
7575
const DynamicMeter* meter = Hashtable_get(dynamics, key);
7676
return meter ? meter->name : NULL;
7777
}

DynamicMeter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ Hashtable* DynamicMeters_new(void);
2626

2727
void DynamicMeters_delete(Hashtable* dynamics);
2828

29-
const char* DynamicMeter_lookup(Hashtable* dynamics, unsigned int key);
29+
const char* DynamicMeter_lookup(Hashtable* dynamics, ht_key_t key);
3030

31-
bool DynamicMeter_search(Hashtable* dynamics, const char* name, unsigned int* key);
31+
bool DynamicMeter_search(Hashtable* dynamics, const char* name, ht_key_t* key);
3232

3333
extern const MeterClass DynamicMeter_class;
3434

pcp/PCPDynamicScreen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ void PCPDynamicScreens_addAvailableColumns(Panel* availableColumns, Hashtable* s
393393
Vector_prune(availableColumns->items);
394394

395395
bool success;
396-
unsigned int key;
396+
ht_key_t key;
397397
success = DynamicScreen_search(screens, screen, &key);
398398
if (!success)
399399
return;

0 commit comments

Comments
 (0)