Imported Upstream version 0.8.0.4

[psensor-pkg-debian.git] / src / lib / color.c

diff --git a/src/lib/color.c b/src/lib/color.c
index 0c5e30c..ab8462d 100644 (file)
--- a/src/lib/color.c
+++ b/src/lib/color.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2013 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -23,9 +23,10 @@
 
 #include "color.h"
 
-void
-color_set(struct color *color,
-         unsigned int red, unsigned int green, unsigned int blue)
+void color_set(struct color *color,
+              unsigned int red,
+              unsigned int green,
+              unsigned int blue)
 {
        color->red = red;
        color->green = green;
@@ -65,7 +66,7 @@ int is_color(const char *str)
        return 1;
 }
 
-struct color *string_to_color(const char *str)
+struct color *str_to_color(const char *str)
 {
        char tmp[5];
        unsigned int red, green, blue;
@@ -88,7 +89,7 @@ struct color *string_to_color(const char *str)
        return color_new(red, green, blue);
 }
 
-char *color_to_string(struct color *color)
+char *color_to_str(const struct color *color)
 {
        char *str = malloc(1 + 12 + 1);