Merge branch 'for-next/misc'

7 files changed, 15 insertions, 13 deletions

diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 1a5e8d0d3d..0ab530d3b1 100644
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -218,4 +218,3 @@ int fnmatch(const char *pattern, const char *string, int flags)
 
 # undef FOLD
 }
-
diff --git a/lib/gui/image_renderer.c b/lib/gui/image_renderer.c
index dd29389baa..9bef99a7b0 100644
--- a/lib/gui/image_renderer.c
+++ b/lib/gui/image_renderer.c
@@ -37,10 +37,10 @@ struct image *image_renderer_open(const char* file)
 	struct image *img;
 	int ret;
 
-	data = read_file(file, &size);
-	if (!data) {
-		printf("unable to read %s\n", file);
-		return ERR_PTR(-ENOMEM);
+	ret = read_file_2(file, &size, &data, FILESIZE_MAX);
+	if (ret) {
+		printf("unable to read %s: %s\n", file, strerror(-ret));
+		return ERR_PTR(ret);
 	}
 
 	ir = get_renderer(data, size);
diff --git a/lib/libfile.c b/lib/libfile.c
index 8acff042c8..ba03700aba 100644
--- a/lib/libfile.c
+++ b/lib/libfile.c
@@ -184,8 +184,8 @@ again:
 
 	if (read_size < s.st_size)
 		return -EFBIG;
-	else
-		return 0;
+
+	return 0;
 
 err_out1:
 	close(fd);
diff --git a/lib/lzo/lzo1x_decompress_safe.c b/lib/lzo/lzo1x_decompress_safe.c
index 3c0f512634..6e8c822b3a 100644
--- a/lib/lzo/lzo1x_decompress_safe.c
+++ b/lib/lzo/lzo1x_decompress_safe.c
@@ -258,4 +258,3 @@ lookbehind_overrun:
 }
 
 EXPORT_SYMBOL(lzo1x_decompress_safe);
-
diff --git a/lib/parameter.c b/lib/parameter.c
index 865ad9f431..60642f001b 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -122,6 +122,14 @@ static const char *param_get_generic(struct device_d *dev, struct param_d *p)
 	return p->value ? p->value : "";
 }
 
+static int compare(struct list_head *a, struct list_head *b)
+{
+	char *na = (char*)list_entry(a, struct param_d, list)->name;
+	char *nb = (char*)list_entry(b, struct param_d, list)->name;
+
+	return strcmp(na, nb);
+}
+
 static int __dev_add_param(struct param_d *param, struct device_d *dev, const char *name,
 		int (*set)(struct device_d *dev, struct param_d *p, const char *val),
 		const char *(*get)(struct device_d *dev, struct param_d *p),
@@ -145,7 +153,7 @@ static int __dev_add_param(struct param_d *param, struct device_d *dev, const ch
 
 	param->flags = flags;
 	param->dev = dev;
-	list_add_tail(&param->list, &dev->parameters);
+	list_add_sort(&param->list, &dev->parameters, compare);
 
 	return 0;
 }
@@ -575,7 +583,6 @@ struct param_d *dev_add_param_llint_ro(struct device_d *dev, const char *name,
 	return &piro->param;
 }
 
-#ifdef CONFIG_NET
 struct param_ip {
 	struct param_d param;
 	IPaddr_t *ip;
@@ -739,7 +746,6 @@ struct param_d *dev_add_param_mac(struct device_d *dev, const char *name,
 
 	return &pm->param;
 }
-#endif
 
 /**
  * dev_remove_param - remove a parameter from a device and free its
diff --git a/lib/random.c b/lib/random.c
index 14c7da119d..210fea9946 100644
--- a/lib/random.c
+++ b/lib/random.c
@@ -25,4 +25,3 @@ void get_random_bytes(void *_buf, int len)
 	while (len--)
 		*buf++ = rand() % 256;
 }
-
diff --git a/lib/strtox.c b/lib/strtox.c
index 882865b45d..cfe61240cc 100644
--- a/lib/strtox.c
+++ b/lib/strtox.c
@@ -65,4 +65,3 @@ unsigned long long simple_strtoull (const char *cp, char **endp, unsigned int ba
 	return result;
 }
 EXPORT_SYMBOL(simple_strtoull);
-