fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 08:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

_dbus_file_path_extract_elements_from_tail: don't misuse static variable

Browse source 
If we _dbus_verbose() from more than one thread at the same time,
we don't want to get into trouble with static variables (and I don't
think micro-optimizing this function is really worth it anyway).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
This commit is contained in:
Simon McVittie 2013-08-29 12:49:35 +01:00
parent 31edd76313
commit cc28d8d910
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
dbus/dbus-internals.c
View file

@ -332,25 +332,22 @@ _dbus_verbose_init (void)
*/
static char *_dbus_file_path_extract_elements_from_tail(const char *file,int level)
{
static int prefix = -1;
int prefix = 0;
char *p = (char *)file + strlen(file);
int i = 0;
if (prefix == -1)
for (;p >= file;p--)
{
char *p = (char *)file + strlen(file);
int i = 0;
prefix = 0;
for (;p >= file;p--)
if (DBUS_IS_DIR_SEPARATOR(*p))
{
if (DBUS_IS_DIR_SEPARATOR(*p))
if (++i >= level)
{
if (++i >= level)
{
prefix = p-file+1;
break;
}
}
}
prefix = p-file+1;
break;
}
}
}
return (char *)file+prefix;
}