Merge remote-tracking branch 'mpi/master'

[paraslash.git] / string.c

diff --git a/string.c b/string.c
index 21c674ec3753f64c9115556ca80bb3e751e42ed3..dfcfa2cdf6eb776c63afdaec981aed55147a31b1 100644 (file)
--- a/string.c
+++ b/string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #define _GNU_SOURCE
 
-#include <sys/time.h> /* gettimeofday */
 #include <pwd.h>
 #include <sys/utsname.h> /* uname() */
 
@@ -1091,7 +1090,7 @@ int skip_cells(const char *s, size_t cells_to_skip, size_t *bytes_to_skip)
  * \param result The width of \a s is returned here.
  *
  * If not in UTF8-mode. this function is just a wrapper for strlen(3).
- * Otherwise \s is treated as an UTF-8 string and its display width is
+ * Otherwise \a s is treated as an UTF-8 string and its display width is
  * computed. Note that this function may fail if the underlying call to
  * mbsrtowcs(3) fails, so the caller must check the return value.
  *