replace strcmp() == 0 with streq()

ardera · ardera · commit be323fc8cfb5 · 2023-05-16T21:14:53.000+02:00
diff --git a/src/flutter-pi.c b/src/flutter-pi.c
@@ -1897,7 +1897,7 @@ static bool parse_cmd_args(int argc, char **argv, struct cmd_args *result_out) {
 
             case 'p':
                 for (unsigned i = 0; i < n_pixfmt_infos; i++) {
-                    if (strcmp(optarg, pixfmt_infos[i].arg_name) == 0) {
+                    if (streq(optarg, pixfmt_infos[i].arg_name)) {
                         result_out->has_pixel_format = true;
                         result_out->pixel_format = pixfmt_infos[i].format;
                         goto valid_format;
diff --git a/src/locales.c b/src/locales.c
@@ -322,7 +322,7 @@ struct locales *locales_new(void) {
         i++;
     }
 
-    if (strcmp(fl_locales[0]->language_code, "C") == 0) {
+    if (streq(fl_locales[0]->language_code, "C")) {
         LOG_LOCALES_ERROR("Warning: The system has no configured locale. The default \"C\" locale may or may not be supported by the app.\n"
         );
     }
diff --git a/src/modesetting.c b/src/modesetting.c
@@ -648,12 +648,12 @@ static int fetch_plane(int drm_fd, uint32_t plane_id, struct drm_plane *plane_ou
             goto fail_maybe_free_supported_formats;
         }
 
-        if (strcmp(info->name, "type") == 0) {
+        if (streq(info->name, "type")) {
             assert(has_type == false);
             has_type = true;
 
             type = props->prop_values[j];
-        } else if (strcmp(info->name, "rotation") == 0) {
+        } else if (streq(info->name, "rotation")) {
             assert(has_rotation == false);
             has_rotation = true;
 
@@ -672,7 +672,7 @@ static int fetch_plane(int drm_fd, uint32_t plane_id, struct drm_plane *plane_ou
             }
 
             committed_rotation.u64 = props->prop_values[j];
-        } else if (strcmp(info->name, "zpos") == 0) {
+        } else if (streq(info->name, "zpos")) {
             assert(has_zpos == false);
             has_zpos = true;
 
@@ -706,23 +706,23 @@ static int fetch_plane(int drm_fd, uint32_t plane_id, struct drm_plane *plane_ou
                     min_zpos = max_zpos = hardcoded_zpos;
                 }
             }
-        } else if (strcmp(info->name, "SRC_X") == 0) {
+        } else if (streq(info->name, "SRC_X")) {
             comitted_src_x = props->prop_values[j];
-        } else if (strcmp(info->name, "SRC_Y") == 0) {
+        } else if (streq(info->name, "SRC_Y")) {
             comitted_src_y = props->prop_values[j];
-        } else if (strcmp(info->name, "SRC_W") == 0) {
+        } else if (streq(info->name, "SRC_W")) {
             comitted_src_w = props->prop_values[j];
-        } else if (strcmp(info->name, "SRC_H") == 0) {
+        } else if (streq(info->name, "SRC_H")) {
             comitted_src_h = props->prop_values[j];
-        } else if (strcmp(info->name, "CRTC_X") == 0) {
+        } else if (streq(info->name, "CRTC_X")) {
             comitted_crtc_x = props->prop_values[j];
-        } else if (strcmp(info->name, "CRTC_Y") == 0) {
+        } else if (streq(info->name, "CRTC_Y")) {
             comitted_crtc_y = props->prop_values[j];
-        } else if (strcmp(info->name, "CRTC_W") == 0) {
+        } else if (streq(info->name, "CRTC_W")) {
             comitted_crtc_w = props->prop_values[j];
-        } else if (strcmp(info->name, "CRTC_H") == 0) {
+        } else if (streq(info->name, "CRTC_H")) {
             comitted_crtc_h = props->prop_values[j];
-        } else if (strcmp(info->name, "IN_FORMATS") == 0) {
+        } else if (streq(info->name, "IN_FORMATS")) {
             drmModePropertyBlobRes *blob;
 
             blob = drmModeGetPropertyBlob(drm_fd, props->prop_values[j]);
@@ -768,26 +768,26 @@ static int fetch_plane(int drm_fd, uint32_t plane_id, struct drm_plane *plane_ou
             }
 
             drmModeFreePropertyBlob(blob);
-        } else if (strcmp(info->name, "alpha") == 0) {
+        } else if (streq(info->name, "alpha")) {
             has_alpha = true;
             assert(info->flags == DRM_MODE_PROP_RANGE);
             assert(info->values[0] == 0);
             assert(info->values[1] == 0xFFFF);
             assert(props->prop_values[j] <= 0xFFFF);
 
             committed_alpha = (uint16_t) props->prop_values[j];
-        } else if (strcmp(info->name, "pixel blend mode") == 0) {
+        } else if (streq(info->name, "pixel blend mode")) {
             has_blend_mode = true;
             assert(info->flags == DRM_MODE_PROP_ENUM);
 
             for (int i = 0; i < info->count_enums; i++) {
-                if (strcmp(info->enums[i].name, "None") == 0) {
+                if (streq(info->enums[i].name, "None")) {
                     ASSERT_EQUALS(info->enums[i].value, kNone_DrmBlendMode);
                     supported_blend_modes[kNone_DrmBlendMode] = true;
-                } else if (strcmp(info->enums[i].name, "Pre-multiplied") == 0) {
+                } else if (streq(info->enums[i].name, "Pre-multiplied")) {
                     ASSERT_EQUALS(info->enums[i].value, kPremultiplied_DrmBlendMode);
                     supported_blend_modes[kPremultiplied_DrmBlendMode] = true;
-                } else if (strcmp(info->enums[i].name, "Coverage") == 0) {
+                } else if (streq(info->enums[i].name, "Coverage")) {
                     ASSERT_EQUALS(info->enums[i].value, kCoverage_DrmBlendMode);
                     supported_blend_modes[kCoverage_DrmBlendMode] = true;
                 } else {
diff --git a/src/platformchannel.c b/src/platformchannel.c
@@ -884,9 +884,9 @@ int platch_decode(const uint8_t *buffer, size_t size, enum platch_codec codec, s
                 return EBADMSG;
 
             for (int i = 0; i < root_jsvalue.size; i++) {
-                if ((strcmp(root_jsvalue.keys[i], "method") == 0) && (root_jsvalue.values[i].type == kJsonString)) {
+                if ((streq(root_jsvalue.keys[i], "method")) && (root_jsvalue.values[i].type == kJsonString)) {
                     object_out->method = root_jsvalue.values[i].string_value;
-                } else if (strcmp(root_jsvalue.keys[i], "args") == 0) {
+                } else if (streq(root_jsvalue.keys[i], "args")) {
                     object_out->json_arg = root_jsvalue.values[i];
                 } else
                     return EBADMSG;
@@ -1487,7 +1487,7 @@ bool jsvalue_equals(struct json_value *a, struct json_value *b) {
         case kJsonTrue:
         case kJsonFalse: return true;
         case kJsonNumber: return a->number_value == b->number_value;
-        case kJsonString: return strcmp(a->string_value, b->string_value) == 0;
+        case kJsonString: return streq(a->string_value, b->string_value);
         case kJsonArray:
             if (a->size != b->size)
                 return false;
@@ -1514,7 +1514,7 @@ bool jsvalue_equals(struct json_value *a, struct json_value *b) {
                 while (j < a->size) {
                     while (_keyInBAlsoInA[j] && (j < a->size))
                         j++;  // skip all keys with _keyInBAlsoInA set to true.
-                    if (strcmp(key, b->keys[j]) != 0)
+                    if (!streq(key, b->keys[j]))
                         j++;  // if b->keys[j] is not equal to "key", continue searching
                     else {
                         _keyInBAlsoInA[j] = true;
@@ -1541,7 +1541,7 @@ bool jsvalue_equals(struct json_value *a, struct json_value *b) {
 struct json_value *jsobject_get(struct json_value *object, char *key) {
     int i;
     for (i = 0; i < object->size; i++)
-        if (strcmp(object->keys[i], key) == 0)
+        if (streq(object->keys[i], key))
             break;
 
     if (i != object->size)
@@ -1570,7 +1570,7 @@ bool stdvalue_equals(struct std_value *a, struct std_value *b) {
         case kStdString:
             ASSERT_NOT_NULL(a->string_value);
             ASSERT_NOT_NULL(b->string_value);
-            return strcmp(a->string_value, b->string_value) == 0;
+            return streq(a->string_value, b->string_value);
         case kStdFloat64: return a->float64_value == b->float64_value;
         case kStdUInt8Array:
             if (a->size != b->size)
diff --git a/src/plugins/audioplayers/player.c b/src/plugins/audioplayers/player.c
@@ -233,7 +233,7 @@ void audio_player_on_media_error(struct audio_player *self, GError *error, gchar
 
 void audio_player_on_media_state_change(struct audio_player *self, GstObject *src, GstState *old_state, GstState *new_state) {
     (void) old_state;
-    if (strcmp(GST_OBJECT_NAME(src), "playbin") == 0) {
+    if (streq(GST_OBJECT_NAME(src), "playbin")) {
         if (*new_state >= GST_STATE_READY) {
             if (!self->is_initialized) {
                 self->is_initialized = true;
@@ -431,7 +431,7 @@ void audio_player_set_position(struct audio_player *self, int64_t position) {
 
 void audio_player_set_source_url(struct audio_player *self, char *url) {
     ASSERT_NOT_NULL(url);
-    if (self->url == NULL || strcmp(self->url, url)) {
+    if (self->url == NULL || !streq(self->url, url)) {
         if (self->url != NULL) {
             free(self->url);
             self->url = NULL;
@@ -449,5 +449,5 @@ void audio_player_set_source_url(struct audio_player *self, char *url) {
 }
 
 bool audio_player_is_id(struct audio_player *self, char *player_id) {
-    return strcmp(self->player_id, player_id) == 0;
+    return streq(self->player_id, player_id);
 }
diff --git a/src/plugins/audioplayers/plugin.c b/src/plugins/audioplayers/plugin.c
@@ -56,25 +56,25 @@ static int on_local_method_call(char *channel, struct platch_obj *object, Flutte
         return platch_respond_native_error_std(responsehandle, ENOMEM);
     }
 
-    if (strcmp(method, "pause") == 0) {
+    if (streq(method, "pause")) {
         audio_player_pause(player);
-    } else if (strcmp(method, "resume") == 0) {
+    } else if (streq(method, "resume")) {
         audio_player_resume(player);
-    } else if (strcmp(method, "stop") == 0) {
+    } else if (streq(method, "stop")) {
         audio_player_pause(player);
         audio_player_set_position(player, 0);
-    } else if (strcmp(method, "release") == 0) {
+    } else if (streq(method, "release")) {
         audio_player_pause(player);
         audio_player_set_position(player, 0);
-    } else if (strcmp(method, "seek") == 0) {
+    } else if (streq(method, "seek")) {
         tmp = stdmap_get_str(args, "position");
         if (tmp == NULL || !STDVALUE_IS_INT(*tmp)) {
             return platch_respond_illegal_arg_std(responsehandle, "Expected `arg['position']` to be an int.");
         }
 
         int64_t position = STDVALUE_AS_INT(*tmp);
         audio_player_set_position(player, position);
-    } else if (strcmp(method, "setSourceUrl") == 0) {
+    } else if (streq(method, "setSourceUrl")) {
         tmp = stdmap_get_str(args, "url");
         if (tmp == NULL || !STDVALUE_IS_STRING(*tmp)) {
             return platch_respond_illegal_arg_std(responsehandle, "Expected `arg['url']` to be a string.");
@@ -97,25 +97,25 @@ static int on_local_method_call(char *channel, struct platch_obj *object, Flutte
         }
 
         audio_player_set_source_url(player, url);
-    } else if (strcmp(method, "getDuration") == 0) {
+    } else if (streq(method, "getDuration")) {
         result = audio_player_get_duration(player);
-    } else if (strcmp(method, "setVolume") == 0) {
+    } else if (streq(method, "setVolume")) {
         tmp = stdmap_get_str(args, "volume");
         if (tmp != NULL && STDVALUE_IS_FLOAT(*tmp)) {
             audio_player_set_volume(player, STDVALUE_AS_FLOAT(*tmp));
         } else {
             return platch_respond_illegal_arg_std(responsehandle, "Expected `arg['volume']` to be a float.");
         }
-    } else if (strcmp(method, "getCurrentPosition") == 0) {
+    } else if (streq(method, "getCurrentPosition")) {
         result = audio_player_get_position(player);
-    } else if (strcmp(method, "setPlaybackRate") == 0) {
+    } else if (streq(method, "setPlaybackRate")) {
         tmp = stdmap_get_str(args, "playback_rate");
         if (tmp != NULL && STDVALUE_IS_FLOAT(*tmp)) {
             audio_player_set_playback_rate(player, STDVALUE_AS_FLOAT(*tmp));
         } else {
             return platch_respond_illegal_arg_std(responsehandle, "Expected `arg['playback_rate']` to be a float.");
         }
-    } else if (strcmp(method, "setReleaseMode") == 0) {
+    } else if (streq(method, "setReleaseMode")) {
         tmp = stdmap_get_str(args, "release_mode");
         if (tmp != NULL && STDVALUE_IS_STRING(*tmp)) {
             char *release_mode = STDVALUE_AS_STRING(*tmp);
@@ -124,7 +124,7 @@ static int on_local_method_call(char *channel, struct platch_obj *object, Flutte
         } else {
             return platch_respond_illegal_arg_std(responsehandle, "Expected `arg['release_mode']` to be a string.");
         }
-    } else if (strcmp(method, "setPlayerMode") == 0) {
+    } else if (streq(method, "setPlayerMode")) {
         // TODO check support for low latency mode:
         // https://gstreamer.freedesktop.org/documentation/additional/design/latency.html?gi-language=c
     } else {
diff --git a/src/plugins/gstreamer_video_player/plugin.c b/src/plugins/gstreamer_video_player/plugin.c
@@ -77,7 +77,7 @@ static struct gstplayer *get_player_by_evch(const char *const event_channel_name
     cpset_lock(&plugin.players);
     for_each_pointer_in_cpset(&plugin.players, player) {
         meta = gstplayer_get_userdata_locked(player);
-        if (strcmp(meta->event_channel_name, event_channel_name) == 0) {
+        if (streq(meta->event_channel_name, event_channel_name)) {
             cpset_unlock(&plugin.players);
             return player;
         }
diff --git a/src/plugins/services.h b/src/plugins/services.h
@@ -5,10 +5,10 @@
 #include <string.h>
 
 #define ORIENTATION_FROM_STRING(str)                                          \
-    (strcmp(str, "DeviceOrientation.portraitUp") == 0     ? kPortraitUp :     \
-     strcmp(str, "DeviceOrientation.landscapeLeft") == 0  ? kLandscapeLeft :  \
-     strcmp(str, "DeviceOrientation.portraitDown") == 0   ? kPortraitDown :   \
-     strcmp(str, "DeviceOrientation.landscapeRight") == 0 ? kLandscapeRight : \
+    (streq(str, "DeviceOrientation.portraitUp")     ? kPortraitUp :     \
+     streq(str, "DeviceOrientation.landscapeLeft")  ? kLandscapeLeft :  \
+     streq(str, "DeviceOrientation.portraitDown")   ? kPortraitDown :   \
+     streq(str, "DeviceOrientation.landscapeRight") ? kLandscapeRight : \
                                                             -1)
 
 #define FLUTTER_NAVIGATION_CHANNEL "flutter/navigation"
diff --git a/src/vk_renderer.c b/src/vk_renderer.c
@@ -20,7 +20,7 @@ FILE_DESCR("vulkan renderer")
 
 UNUSED static VkLayerProperties *get_layer_props(int n_layers, VkLayerProperties *layers, const char *layer_name) {
     for (int i = 0; i < n_layers; i++) {
-        if (strcmp(layers[i].layerName, layer_name) == 0) {
+        if (streq(layers[i].layerName, layer_name)) {
             return layers + i;
         }
     }
@@ -33,7 +33,7 @@ UNUSED static bool supports_layer(int n_layers, VkLayerProperties *layers, const
 
 static VkExtensionProperties *get_extension_props(int n_extensions, VkExtensionProperties *extensions, const char *extension_name) {
     for (int i = 0; i < n_extensions; i++) {
-        if (strcmp(extensions[i].extensionName, extension_name) == 0) {
+        if (streq(extensions[i].extensionName, extension_name)) {
             return extensions + i;
         }
     }
@@ -122,7 +122,7 @@ static int score_physical_device(VkPhysicalDevice device, const char **required_
 
     for (const char **cursor = required_device_extensions; *cursor != NULL; cursor++) {
         for (unsigned i = 0; i < n_available_extensions; i++) {
-            if (strcmp(available_extensions[i].extensionName, *cursor) == 0) {
+            if (streq(available_extensions[i].extensionName, *cursor)) {
                 goto found;
             }
         }
diff --git a/src/window.c b/src/window.c
@@ -739,12 +739,12 @@ static int select_mode(
                 return ENOMEM;
             }
 
-            if (strcmp(modeline, desired_videomode) == 0) {
+            if (streq(modeline, desired_videomode)) {
                 // Probably a bit superfluos, but the refresh rate can still vary in the decimal places.
                 if (mode == NULL || (mode_get_vrefresh(mode_iter) > mode_get_vrefresh(mode))) {
                     mode = mode_iter;
                 }
-            } else if (strcmp(modeline_nohz, desired_videomode) == 0) {
+            } else if (streq(modeline_nohz, desired_videomode)) {
                 if (mode == NULL || (mode_get_vrefresh(mode_iter) > mode_get_vrefresh(mode))) {
                     mode = mode_iter;
                 }

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ struct locales *locales_new(void) {`
`322`	`322`	`i++;`
`323`	`323`	`}`
`324`	`324`
`325`		`- if (strcmp(fl_locales[0]->language_code, "C") == 0) {`
	`325`	`+ if (streq(fl_locales[0]->language_code, "C")) {`
`326`	`326`	`LOG_LOCALES_ERROR("Warning: The system has no configured locale. The default \"C\" locale may or may not be supported by the app.\n"`
`327`	`327`	`);`
`328`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ static struct gstplayer get_player_by_evch(const char const event_channel_name`
`77`	`77`	`cpset_lock(&plugin.players);`
`78`	`78`	`for_each_pointer_in_cpset(&plugin.players, player) {`
`79`	`79`	`meta = gstplayer_get_userdata_locked(player);`
`80`		`- if (strcmp(meta->event_channel_name, event_channel_name) == 0) {`
	`80`	`+ if (streq(meta->event_channel_name, event_channel_name)) {`
`81`	`81`	`cpset_unlock(&plugin.players);`
`82`	`82`	`return player;`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ FILE_DESCR("vulkan renderer")`
`20`	`20`
`21`	`21`	`UNUSED static VkLayerProperties get_layer_props(int n_layers, VkLayerProperties layers, const char *layer_name) {`
`22`	`22`	`for (int i = 0; i < n_layers; i++) {`
`23`		`- if (strcmp(layers[i].layerName, layer_name) == 0) {`
	`23`	`+ if (streq(layers[i].layerName, layer_name)) {`
`24`	`24`	`return layers + i;`
`25`	`25`	`}`
`26`	`26`	`}`
`@@ -33,7 +33,7 @@ UNUSED static bool supports_layer(int n_layers, VkLayerProperties *layers, const`
`33`	`33`
`34`	`34`	`static VkExtensionProperties get_extension_props(int n_extensions, VkExtensionProperties extensions, const char *extension_name) {`
`35`	`35`	`for (int i = 0; i < n_extensions; i++) {`
`36`		`- if (strcmp(extensions[i].extensionName, extension_name) == 0) {`
	`36`	`+ if (streq(extensions[i].extensionName, extension_name)) {`
`37`	`37`	`return extensions + i;`
`38`	`38`	`}`
`39`	`39`	`}`
`@@ -122,7 +122,7 @@ static int score_physical_device(VkPhysicalDevice device, const char **required_`
`122`	`122`
`123`	`123`	`for (const char *cursor = required_device_extensions; cursor != NULL; cursor++) {`
`124`	`124`	`for (unsigned i = 0; i < n_available_extensions; i++) {`
`125`		`- if (strcmp(available_extensions[i].extensionName, *cursor) == 0) {`
	`125`	`+ if (streq(available_extensions[i].extensionName, *cursor)) {`
`126`	`126`	`goto found;`
`127`	`127`	`}`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -739,12 +739,12 @@ static int select_mode(`
`739`	`739`	`return ENOMEM;`
`740`	`740`	`}`
`741`	`741`
`742`		`- if (strcmp(modeline, desired_videomode) == 0) {`
	`742`	`+ if (streq(modeline, desired_videomode)) {`
`743`	`743`	`// Probably a bit superfluos, but the refresh rate can still vary in the decimal places.`
`744`	`744`	`if (mode == NULL \|\| (mode_get_vrefresh(mode_iter) > mode_get_vrefresh(mode))) {`
`745`	`745`	`mode = mode_iter;`
`746`	`746`	`}`
`747`		`- } else if (strcmp(modeline_nohz, desired_videomode) == 0) {`
	`747`	`+ } else if (streq(modeline_nohz, desired_videomode)) {`
`748`	`748`	`if (mode == NULL \|\| (mode_get_vrefresh(mode_iter) > mode_get_vrefresh(mode))) {`
`749`	`749`	`mode = mode_iter;`
`750`	`750`	`}`