Changeset 178e2f8 for lib

Timestamp:

2008-06-28T17:32:41Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

47b571d

Parents:

2e0f24d (diff), e0f9170 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge trunk.

Location:

lib

Files:

• misc.c (modified) (1 diff)
• misc.h (modified) (1 diff)

lib/misc.c

@@ -60 +60 @@
         strcpy(text, text2);
         g_free(text2);
-}
-
-char *normalize(const char *s)
-{
-        static char buf[BUF_LEN];
-        char *t, *u;
-        int x = 0;
-
-        g_return_val_if_fail((s != NULL), NULL);
-
-        u = t = g_strdup(s);
-
-        strcpy(t, s);
-        g_strdown(t);
-
-        while (*t && (x < BUF_LEN - 1)) {
-                if (*t != ' ') {
-                        buf[x] = *t;
-                        x++;
-                }
-                t++;
-        }
-        buf[x] = '\0';
-        g_free(u);
-        return buf;
 }
 

lib/misc.h

@@ -41 +41 @@
 G_MODULE_EXPORT char *add_cr( char *text );
 G_MODULE_EXPORT char *strip_newlines(char *source);
-G_MODULE_EXPORT char *normalize( const char *s );
 
 G_MODULE_EXPORT time_t get_time( int year, int month, int day, int hour, int min, int sec );