Merge branch 'jc/strmap-remove-typefix'

gitster · gitster · commit e0f58c9b3e53 · 2020-12-18T15:15:17.000-08:00
C-std compliance fix.

* jc/strmap-remove-typefix:
  strmap: make callers of strmap_remove() to call it in void context
diff --git a/strmap.h b/strmap.h
@@ -165,7 +165,7 @@ static inline int strintmap_contains(struct strintmap *map, const char *str)
 
 static inline void strintmap_remove(struct strintmap *map, const char *str)
 {
-	return strmap_remove(&map->map, str, 0);
+	strmap_remove(&map->map, str, 0);
 }
 
 static inline int strintmap_empty(struct strintmap *map)
@@ -249,7 +249,7 @@ static inline int strset_contains(struct strset *set, const char *str)
 
 static inline void strset_remove(struct strset *set, const char *str)
 {
-	return strmap_remove(&set->map, str, 0);
+	strmap_remove(&set->map, str, 0);
 }
 
 static inline int strset_empty(struct strset *set)

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ static inline int strintmap_contains(struct strintmap map, const char str)`
`165`	`165`
`166`	`166`	`static inline void strintmap_remove(struct strintmap map, const char str)`
`167`	`167`	`{`
`168`		`- return strmap_remove(&map->map, str, 0);`
	`168`	`+ strmap_remove(&map->map, str, 0);`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`static inline int strintmap_empty(struct strintmap *map)`
`@@ -249,7 +249,7 @@ static inline int strset_contains(struct strset set, const char str)`
`249`	`249`
`250`	`250`	`static inline void strset_remove(struct strset set, const char str)`
`251`	`251`	`{`
`252`		`- return strmap_remove(&set->map, str, 0);`
	`252`	`+ strmap_remove(&set->map, str, 0);`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`static inline int strset_empty(struct strset *set)`