colors, utils: use g_list_free_full(g_free)

[ncmpc.git] / src / utils.c

diff --git a/src/utils.c b/src/utils.c
index 84db64a5b122211081fc0df2a02e206411befb51..3f327f4b0b80914025e6e925452114ed56ef1417 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "utils.h"
 #include "options.h"
@@ -30,15 +30,7 @@
 GList *
 string_list_free(GList *string_list)
 {
-       GList *list = g_list_first(string_list);
-
-       while (list) {
-               g_free(list->data);
-               list->data = NULL;
-               list = list->next;
-       }
-
-       g_list_free(string_list);
+       g_list_free_full(string_list, g_free);
        return NULL;
 }
 
@@ -76,15 +68,13 @@ GList *
 gcmp_list_from_path(struct mpdclient *c, const gchar *path,
                    GList *list, gint types)
 {
-       struct mpd_connection *connection;
-       struct mpd_entity *entity;
-
-       connection = mpdclient_get_connection(c);
+       struct mpd_connection *connection = mpdclient_get_connection(c);
        if (connection == NULL)
                return list;
 
        mpd_send_list_meta(connection, path);
 
+       struct mpd_entity *entity;
        while ((entity = mpd_recv_entity(connection)) != NULL) {
                char *name;
 
@@ -136,37 +126,35 @@ format_duration_short(char *buffer, size_t length, unsigned duration)
 void
 format_duration_long(char *p, size_t length, unsigned long duration)
 {
-       const char *year = _("year");
-       const char *years = _("years");
-       const char *week = _("week");
-       const char *weeks = _("weeks");
-       const char *day = _("day");
-       const char *days = _("days");
        unsigned bytes_written = 0;
 
        if (duration / 31536000 > 0) {
                if (duration / 31536000 == 1)
-                       bytes_written = g_snprintf(p, length, "%d %s, ", 1, year);
+                       bytes_written = g_snprintf(p, length, "%d %s, ", 1, _("year"));
                else
-                       bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 31536000, years);
+                       bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 31536000, _("years"));
                duration %= 31536000;
                length -= bytes_written;
                p += bytes_written;
        }
        if (duration / 604800 > 0) {
                if (duration / 604800 == 1)
-                       bytes_written = g_snprintf(p, length, "%d %s, ", 1, week);
+                       bytes_written = g_snprintf(p, length, "%d %s, ",
+                                                  1, _("week"));
                else
-                       bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 604800, weeks);
+                       bytes_written = g_snprintf(p, length, "%lu %s, ",
+                                                  duration / 604800, _("weeks"));
                duration %= 604800;
                length -= bytes_written;
                p += bytes_written;
        }
        if (duration / 86400 > 0) {
                if (duration / 86400 == 1)
-                       bytes_written = g_snprintf(p, length, "%d %s, ", 1, day);
+                       bytes_written = g_snprintf(p, length, "%d %s, ",
+                                                  1, _("day"));
                else
-                       bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 86400, days);
+                       bytes_written = g_snprintf(p, length, "%lu %s, ",
+                                                  duration / 86400, _("days"));
                duration %= 86400;
                length -= bytes_written;
                p += bytes_written;