summaryrefslogtreecommitdiff
path: root/modules/devices
diff options
context:
space:
mode:
Diffstat (limited to 'modules/devices')
-rw-r--r--modules/devices/printers.c2
-rw-r--r--modules/devices/spd-decode.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/devices/printers.c b/modules/devices/printers.c
index d880e691..0ed9dcda 100644
--- a/modules/devices/printers.c
+++ b/modules/devices/printers.c
@@ -43,7 +43,7 @@ struct _CUPSDest {
static int (*cups_dests_get) (CUPSDest **dests) = NULL;
static int (*cups_dests_free) (int num_dests, CUPSDest *dests) = NULL;
static void (*cups_set_server)(const char *server) = NULL;
-volatile static gboolean cups_init = FALSE;
+static volatile gboolean cups_init = FALSE;
GModule *cups;
diff --git a/modules/devices/spd-decode.c b/modules/devices/spd-decode.c
index 511504b2..cf4c89d7 100644
--- a/modules/devices/spd-decode.c
+++ b/modules/devices/spd-decode.c
@@ -1160,7 +1160,7 @@ static GSList *decode_dimms2(GSList *eeprom_list, const gchar *driver, gboolean
}
if (s) {
- strncpy(s->dev, g_basename(spd_path), 31);
+ strncpy(s->dev, g_path_get_basename(spd_path), 31);
s->spd_driver = driver;
s->spd_size = spd_size;
s->type = ram_type;