diff src/util.h @ 7107:9220c7490cd1

[gaim-migrate @ 7672] This is a big one: normalize() -> gaim_normalize, linkify_text() -> gaim_markup_linkify(), gaim_get_size_string() -> gaim_str_size_to_units(), and moved clean_pid() to main.c. committer: Tailor Script <[e-mail]>

--- a/src/util.h	Wed Oct 01 05:56:58 2003 +0000
+++ b/src/util.h	Wed Oct 01 06:17:28 2003 +0000
@@ -46,7 +46,7 @@
  *
  * @return A pointer to the normalized version stored in a static buffer.
  */
-char *normalize(const char *str);
+char *gaim_normalize(const char *str);
 
 /**
  * Converts a string to its base-64 equivalent.
@@ -96,11 +96,6 @@
 int gaim_base16_decode(const char *str, unsigned char **ret_str);
 
 /**
- * Waits for all child processes to terminate.
- */
-void clean_pid(void);
-
-/**
  * Returns the current local time in hour:minute:second form.
  *
  * The returned string is stored in a static buffer, so the result
@@ -113,15 +108,6 @@
 char *date(void);
 
 /**
- * Adds the necessary HTML code to turn URIs into HTML links in a string.
- *
- * @param str The string to linkify.
- *
- * @return The linkified text.
- */
-char *linkify_text(const char *str);
-
-/**
  * Converts seconds into a human-readable form.
  *
  * @param sec The seconds.
@@ -319,6 +305,7 @@
  *
  * @param haystack The string to search in.
  * @param needle   The substring to find.
+ *
  * @return the location of the substring if found, or NULL if not
  */
 const char *gaim_strcasestr(const char *haystack, const char *needle);
@@ -328,8 +315,10 @@
  * units (MB, KB, GB, etc.)
  *
  * @param size The size
+ *
+ * @return The string in units form. This must be freed.
  */
-char *gaim_get_size_string(size_t size);
+char *gaim_str_size_to_units(size_t size);
 
 /**
  * Finds a HTML tag matching the given name.
@@ -399,6 +388,15 @@
 char *gaim_markup_strip_html(const char *str);
 
 /**
+ * Adds the necessary HTML code to turn URIs into HTML links in a string.
+ *
+ * @param str The string to linkify.
+ *
+ * @return The linkified text.
+ */
+char *gaim_markup_linkify(const char *str);
+
+/**
  * Parses a URL, returning its host, port, and file path.
  *
  * The returned data must be freed.