claen up warnings

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@826 7f574dfc-610e-0410-a909-a81674777703

diff --git a/ChangeLog b/ChangeLog
index 40d614c..a487c44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 2006-01-07
        * Add config.rpath (created by gettextize -copy) to distributtion
          to satisfy AM_ICONV.
+       * Clean up some warnings.
 
 2006-12-29
        * Update svn ebuild to new sourceforge url scheme.

diff --git a/src/conky.c b/src/conky.c
index b9cef5b..96c39e4 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -4644,7 +4644,7 @@ static void generate_text_internal(char *p, int p_max_size, struct text_object *
                                } else {
                                        obj->data.tail.last_update = current_update_time;
                                        FILE *fp;
-                                       long nl, bsize;
+                                       long nl=0, bsize;
                                        int iter;
                                        fp = fopen(obj->data.tail.logfile, "rt");
                                        if (fp == NULL) {
@@ -4708,7 +4708,7 @@ static void generate_text_internal(char *p, int p_max_size, struct text_object *
                                } else {
                                        obj->data.tail.last_update = current_update_time;
                                        FILE *fp;
-                                       long nl;
+                                       long nl=0;
                                        int iter;
                                        fp = fopen(obj->data.tail.logfile, "rt");
                                        if (fp == NULL) {

diff --git a/src/libmpdclient.c b/src/libmpdclient.c
index 27bd9ad..5e2c8e0 100644 (file)
--- a/src/libmpdclient.c
+++ b/src/libmpdclient.c
@@ -300,6 +300,8 @@ static int mpd_parseWelcome(mpd_Connection * connection, const char * host, int
        char * test;
        int i;
 
+  rt = (char *)rt;
+
        if(strncmp(output,MPD_WELCOME_MESSAGE,strlen(MPD_WELCOME_MESSAGE))) {
                snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
                                "mpd not running on port %i on host \"%s\"",