aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/config
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/config')
-rw-r--r--xorg-server/config/config.c18
-rw-r--r--xorg-server/config/udev.c32
2 files changed, 9 insertions, 41 deletions
diff --git a/xorg-server/config/config.c b/xorg-server/config/config.c
index 46f2532ec..def7f16ca 100644
--- a/xorg-server/config/config.c
+++ b/xorg-server/config/config.c
@@ -132,10 +132,7 @@ config_odev_allocate_attribute_list(void)
{
struct OdevAttributes *attriblist;
- attriblist = malloc(sizeof(struct OdevAttributes));
- if (!attriblist)
- return NULL;
-
+ attriblist = XNFalloc(sizeof(struct OdevAttributes));
xorg_list_init(&attriblist->list);
return attriblist;
}
@@ -168,10 +165,7 @@ config_odev_find_or_add_attribute(struct OdevAttributes *attribs, int attrib)
if (oa)
return oa;
- oa = calloc(1, sizeof(struct OdevAttribute));
- if (!oa)
- return oa;
-
+ oa = XNFcalloc(sizeof(struct OdevAttribute));
oa->attrib_id = attrib;
xorg_list_append(&oa->member, &attribs->list);
@@ -185,11 +179,8 @@ config_odev_add_attribute(struct OdevAttributes *attribs, int attrib,
struct OdevAttribute *oa;
oa = config_odev_find_or_add_attribute(attribs, attrib);
- if (!oa)
- return FALSE;
-
free(oa->attrib_name);
- oa->attrib_name = strdup(attrib_name);
+ oa->attrib_name = XNFstrdup(attrib_name);
oa->attrib_type = ODEV_ATTRIB_STRING;
return TRUE;
}
@@ -201,9 +192,6 @@ config_odev_add_int_attribute(struct OdevAttributes *attribs, int attrib,
struct OdevAttribute *oa;
oa = config_odev_find_or_add_attribute(attribs, attrib);
- if (!oa)
- return FALSE;
-
oa->attrib_value = attrib_value;
oa->attrib_type = ODEV_ATTRIB_INT;
return TRUE;
diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c
index d88abaaa1..a1b72c13b 100644
--- a/xorg-server/config/udev.c
+++ b/xorg-server/config/udev.c
@@ -55,7 +55,7 @@
static struct udev_monitor *udev_monitor;
#ifdef CONFIG_UDEV_KMS
-static Bool
+static void
config_udev_odev_setup_attribs(const char *path, const char *syspath,
int major, int minor,
config_odev_probe_proc_ptr probe_callback);
@@ -457,40 +457,20 @@ config_udev_fini(void)
#ifdef CONFIG_UDEV_KMS
-static Bool
+static void
config_udev_odev_setup_attribs(const char *path, const char *syspath,
int major, int minor,
config_odev_probe_proc_ptr probe_callback)
{
struct OdevAttributes *attribs = config_odev_allocate_attribute_list();
- int ret;
-
- if (!attribs)
- return FALSE;
-
- ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_PATH, path);
- if (ret == FALSE)
- goto fail;
-
- ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_SYSPATH, syspath);
- if (ret == FALSE)
- goto fail;
-
- ret = config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major);
- if (ret == FALSE)
- goto fail;
- ret = config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor);
- if (ret == FALSE)
- goto fail;
+ config_odev_add_attribute(attribs, ODEV_ATTRIB_PATH, path);
+ config_odev_add_attribute(attribs, ODEV_ATTRIB_SYSPATH, syspath);
+ config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major);
+ config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor);
/* ownership of attribs is passed to probe layer */
probe_callback(attribs);
- return TRUE;
-fail:
- config_odev_free_attributes(attribs);
- free(attribs);
- return FALSE;
}
void