aboutsummaryrefslogtreecommitdiff
path: root/modules/devices
diff options
context:
space:
mode:
authorLucas de Castro Borges <lucas@gnuabordo.com.br>2024-04-22 18:23:04 -0300
committerLucas de Castro Borges <lucas@gnuabordo.com.br>2024-04-22 18:23:04 -0300
commit76e1a7480ed7a77a442dee8b63574c8516cacdd2 (patch)
treef4b7997875f37b1ae97ea5f4773aebfa9a96965a /modules/devices
parent4212b15b19d6c9db8d2f9fed92e5b9675b2cfe9c (diff)
parentf70f209239d51a5893f8f9f080b19b6ee94ff4af (diff)
Update upstream source from tag 'upstream/2.0.9pre'
Update to upstream version '2.0.9pre' with Debian dir 817dddd03e0e9bc80d4f80e98431c08f4e402b1e
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;