Skip to content

Commit 9cc58f2

Browse files
committed
RARCH_LOG_V - some style nits
1 parent f452d31 commit 9cc58f2

1 file changed

Lines changed: 26 additions & 29 deletions

File tree

verbosity.c

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -221,19 +221,19 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
221221
{
222222
#if defined(_XBOX1) || defined(__WINRT__)
223223
char buffer[256];
224-
int prefix_len;
224+
int _len;
225225
const char *tag_v = tag ? tag : FILE_PATH_LOG_INFO;
226226
buffer[0] = '\0';
227-
prefix_len = snprintf(buffer, sizeof(buffer),
227+
_len = snprintf(buffer, sizeof(buffer),
228228
"%s: %s ", FILE_PATH_PROGRAM_NAME, tag_v);
229229

230-
if (prefix_len > 0 && prefix_len < (int)sizeof(buffer))
230+
if (_len > 0 && _len < (int)sizeof(buffer))
231231
{
232232
#if defined(__WINRT__)
233-
vsnprintf(buffer + prefix_len,
234-
sizeof(buffer) - (size_t)prefix_len, fmt, ap);
233+
vsnprintf(buffer + _len,
234+
sizeof(buffer) - (size_t)_len, fmt, ap);
235235
#else
236-
wvsprintf(buffer + prefix_len, fmt, ap);
236+
wvsprintf(buffer + _len, fmt, ap);
237237
#endif
238238
}
239239

@@ -261,13 +261,9 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
261261

262262
#else
263263
{
264-
verbosity_state_t *g_verbosity;
265-
FILE *fp;
266-
const char *tag_v;
267-
268-
g_verbosity = &main_verbosity_st;
269-
fp = (FILE*)g_verbosity->fp;
270-
tag_v = tag ? tag : FILE_PATH_LOG_INFO;
264+
verbosity_state_t *g_verbosity = &main_verbosity_st;
265+
FILE *fp = (FILE*)g_verbosity->fp;
266+
const char *tag_v = tag ? tag : FILE_PATH_LOG_INFO;
271267

272268
#if defined(HAVE_QT) || defined(__WINRT__)
273269
{
@@ -276,11 +272,11 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
276272

277273
if (vsnprintf(buffer, sizeof(buffer), fmt, ap) < 0)
278274
{
279-
size_t len;
275+
size_t _len;
280276
buffer[sizeof(buffer) - 1] = '\0';
281-
len = strlen(buffer);
282-
if (len > 0)
283-
buffer[len - 1] = '\n';
277+
_len = strlen(buffer);
278+
if (_len > 0)
279+
buffer[_len - 1] = '\n';
284280
else
285281
{
286282
buffer[0] = '\n';
@@ -334,38 +330,39 @@ void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
334330

335331
#else
336332
{
337-
# if TARGET_OS_SIMULATOR
333+
#if TARGET_OS_SIMULATOR
338334
fprintf(stderr, "%s %s", tag_v, buffer);
339-
# elif defined(__IPHONE_10_0) && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_10_0)
335+
#elif defined(__IPHONE_10_0) && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_10_0)
340336
os_log(OS_LOG_DEFAULT, "%s %s", tag_v, buffer);
341-
# elif defined(__TV_OS_VERSION_MIN_REQUIRED) && defined(__TVOS_10_0) \
337+
#elif defined(__TV_OS_VERSION_MIN_REQUIRED) && defined(__TVOS_10_0) \
342338
&& (__TV_OS_VERSION_MIN_REQUIRED >= __TVOS_10_0)
343339
os_log(OS_LOG_DEFAULT, "%s %s", tag_v, buffer);
344-
# else
340+
#else
345341
{
346342
static aslclient asl_client = NULL;
347343
static int asl_initialized = 0;
348344
aslmsg msg;
349345

350-
# if defined(HAVE_LIBNX)
346+
#if defined(HAVE_LIBNX)
351347
mutexLock(&g_verbosity->mtx);
352-
# endif
348+
#endif
353349
if (!asl_initialized)
354350
{
355351
asl_client = asl_open(FILE_PATH_PROGRAM_NAME,
356-
"com.apple.console",
357-
ASL_OPT_STDERR | ASL_OPT_NO_DELAY);
352+
"com.apple.console",
353+
ASL_OPT_STDERR | ASL_OPT_NO_DELAY);
358354
asl_initialized = 1;
359355
}
360-
# if defined(HAVE_LIBNX)
356+
#if defined(HAVE_LIBNX)
361357
mutexUnlock(&g_verbosity->mtx);
362-
# endif
358+
#endif
363359
msg = asl_new(ASL_TYPE_MSG);
364360
asl_set(msg, ASL_KEY_READ_UID, "-1");
365-
asl_log(asl_client, msg, ASL_LEVEL_NOTICE, "%s %s", tag_v, buffer);
361+
asl_log(asl_client, msg, ASL_LEVEL_NOTICE,
362+
"%s %s", tag_v, buffer);
366363
asl_free(msg);
367364
}
368-
# endif
365+
#endif
369366

370367
if (fp)
371368
{

0 commit comments

Comments
 (0)