diff options
| author | Tor Lillqvist <tml@iki.fi> | 2009-10-21 21:52:59 +0300 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2009-12-01 09:20:31 +0100 |
| commit | 99371721af2ddead242d6ba0101019794b270a8d (patch) | |
| tree | 105fcf3389a05505879cdc24873b3b090f0b493a /dbus/dbus-nonce.c | |
| parent | eab064cfc4f0dbb41c9d54fbfa7e6537d2e7dc05 (diff) | |
| download | dbus-99371721af2ddead242d6ba0101019794b270a8d.tar.gz | |
Don't use DBUS_DIR_SEPARATOR
I didn't cherry-pick the commit from dbus4win that introduced
DBUS_DIR_SEPARATOR, as I think it just uglifies the code with little
gain. (Forward) slashes work fine on Windows.
Diffstat (limited to 'dbus/dbus-nonce.c')
| -rw-r--r-- | dbus/dbus-nonce.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c index 8385340f..14afc2ef 100644 --- a/dbus/dbus-nonce.c +++ b/dbus/dbus-nonce.c @@ -274,7 +274,7 @@ do_noncefile_create (DBusNonceFile *noncefile, } if (use_subdir) { - if (!_dbus_string_append (&noncefile->dir, DBUS_DIR_SEPARATOR "dbus_nonce-") + if (!_dbus_string_append (&noncefile->dir, "/dbus_nonce-") || !_dbus_string_append (&noncefile->dir, _dbus_string_get_const_data (&randomStr)) ) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); @@ -282,7 +282,7 @@ do_noncefile_create (DBusNonceFile *noncefile, } if (!_dbus_string_init (&noncefile->path) || !_dbus_string_copy (&noncefile->dir, 0, &noncefile->path, 0) - || !_dbus_string_append (&noncefile->dir, DBUS_DIR_SEPARATOR "nonce")) + || !_dbus_string_append (&noncefile->dir, "/nonce")) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto on_error; @@ -297,7 +297,7 @@ do_noncefile_create (DBusNonceFile *noncefile, { if (!_dbus_string_init (&noncefile->path) || !_dbus_string_copy (&noncefile->dir, 0, &noncefile->path, 0) - || !_dbus_string_append (&noncefile->path, DBUS_DIR_SEPARATOR "dbus_nonce-") + || !_dbus_string_append (&noncefile->path, "/dbus_nonce-") || !_dbus_string_append (&noncefile->path, _dbus_string_get_const_data (&randomStr))) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); |