Skip to content

Commit 8e56782

Browse files
committed
More string_is_empty removal pt. 5
1 parent 193b9b6 commit 8e56782

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

cheevos/cheevos.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1750,7 +1750,7 @@ bool rcheevos_load(const void *data)
17501750
return false;
17511751
}
17521752

1753-
if (string_is_empty(settings->arrays.cheevos_username))
1753+
if (!*settings->arrays.cheevos_username)
17541754
{
17551755
CHEEVOS_LOG(RCHEEVOS_TAG "Cannot login (no username)\n");
17561756
runloop_msg_queue_push(

cheevos/cheevos_client.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ void rcheevos_get_user_agent(rcheevos_locals_t *locals,
118118
ptr = s + strlcpy(s, locals->user_agent_prefix, len);
119119

120120
/* if a core is loaded, append its information */
121-
if (sysinfo && !string_is_empty(sysinfo->library_name))
121+
if (sysinfo && sysinfo->library_name && *sysinfo->library_name)
122122
{
123123
char *stop = s + len - 1;
124124
const char *path = path_get(RARCH_PATH_CORE);
125125
*ptr++ = ' ';
126126

127-
if (!string_is_empty(path))
127+
if (path && *path)
128128
{
129129
append_no_spaces(ptr, stop, path_basename(path));
130130
path_remove_extension(ptr);

input/drivers/android_input.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ bool android_input_can_be_keyboard(void *data, int port)
362362
return false;
363363

364364
state_device_t *device = &android->pad_states[port];
365-
if (!device->id && string_is_empty(device->name))
365+
if (!device->id && (!device->name || !*device->name))
366366
return false;
367367

368368
return android_input_can_be_keyboard_jni(device->id);
@@ -1451,7 +1451,7 @@ static void handle_hotplug(android_input_t *android,
14511451

14521452
/* if device was not keyboard only, yet did not match any of the devices
14531453
* then try to autoconfigure as gamepad based on device_name. */
1454-
else if (!string_is_empty(device_name))
1454+
else if (*device_name)
14551455
strlcpy(name_buf, device_name, sizeof(name_buf));
14561456

14571457
if (strstr(android_app->current_ime, "net.obsidianx.android.mogaime"))

record/record_driver.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ bool recording_deinit(void)
154154
/* Push recording to video history playlist */
155155
#ifdef HAVE_FFMPEG
156156
if ( history_list_enable
157-
&& !string_is_empty(recording_st->path))
157+
&& *recording_st->path)
158158
{
159159
struct playlist_entry entry = {0};
160160

@@ -221,7 +221,7 @@ bool recording_init(void)
221221
(float)av_info->timing.fps,
222222
(float)av_info->timing.sample_rate);
223223

224-
if (!string_is_empty(recording_st->path))
224+
if (*recording_st->path)
225225
strlcpy(output, recording_st->path, sizeof(output));
226226
else
227227
{
@@ -230,7 +230,7 @@ bool recording_init(void)
230230
unsigned video_stream_port = settings->uints.video_stream_port;
231231
if (recording_st->streaming_enable)
232232
{
233-
if (!string_is_empty(stream_url))
233+
if (stream_url && *stream_url)
234234
strlcpy(output, stream_url, sizeof(output));
235235
else
236236
{
@@ -246,8 +246,8 @@ bool recording_init(void)
246246
if (!path_is_directory(recording_st->output_dir))
247247
path_mkdir(recording_st->output_dir);
248248
/* Fallback to core name if started without content */
249-
if (string_is_empty(game_name))
250-
game_name = runloop_st->system.info.library_name;
249+
if (!game_name || !*game_name)
250+
game_name = runloop_st->system.info.library_name;
251251

252252
{
253253
const char *ext = "mkv";
@@ -272,7 +272,7 @@ bool recording_init(void)
272272
}
273273

274274
/* Cache path for playlist saving */
275-
if (!string_is_empty(output))
275+
if (*output)
276276
strlcpy(recording_st->path, output, sizeof(recording_st->path));
277277
}
278278
}
@@ -298,7 +298,7 @@ bool recording_init(void)
298298
: FFEMU_PIX_RGB565;
299299
params.config = NULL;
300300

301-
if (!string_is_empty(recording_st->config))
301+
if (*recording_st->config)
302302
params.config = recording_st->config;
303303
else
304304
{
@@ -427,7 +427,7 @@ void recording_driver_update_streaming_url(void)
427427
switch (settings->uints.streaming_mode)
428428
{
429429
case STREAMING_MODE_TWITCH:
430-
if (!string_is_empty(settings->arrays.twitch_stream_key))
430+
if (*settings->arrays.twitch_stream_key)
431431
{
432432
size_t _len = strlcpy(settings->paths.path_stream_url,
433433
twitch_url,
@@ -438,7 +438,7 @@ void recording_driver_update_streaming_url(void)
438438
}
439439
break;
440440
case STREAMING_MODE_YOUTUBE:
441-
if (!string_is_empty(settings->arrays.youtube_stream_key))
441+
if (*settings->arrays.youtube_stream_key)
442442
{
443443
size_t _len = strlcpy(settings->paths.path_stream_url,
444444
youtube_url,
@@ -459,7 +459,7 @@ void recording_driver_update_streaming_url(void)
459459
}
460460
break;
461461
case STREAMING_MODE_FACEBOOK:
462-
if (!string_is_empty(settings->arrays.facebook_stream_key))
462+
if (*settings->arrays.facebook_stream_key)
463463
{
464464
size_t _len = strlcpy(settings->paths.path_stream_url,
465465
facebook_url,

0 commit comments

Comments
 (0)