From 9547a991cbc6795d6adc0081df363dedcfac0e64 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Wed, 31 Mar 2010 13:17:40 +0400 Subject: [PATCH] Ticket #2119: some trivial corrections. Trivial changes in util.h. Type cast in str_move function. Thanks Vit Rosin for original patch. Signed-off-by: Andrew Borodin --- lib/util.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/util.h b/lib/util.h index 606449c79..22c5d715a 100644 --- a/lib/util.h +++ b/lib/util.h @@ -280,15 +280,16 @@ const char *Q_ (const char *s); * We can't use str*cpy funs here: * http://kerneltrap.org/mailarchive/openbsd-misc/2008/5/27/1951294 */ -static inline char * str_move(char * dest, const char * src) +static inline char * +str_move (char *dest, const char *src) { size_t n; - assert (dest<=src); + assert (dest <= src); n = strlen (src) + 1; /* + '\0' */ - return memmove (dest, src, n); + return (char *) memmove (dest, src, n); } gboolean mc_util_make_backup_if_possible (const char *, const char *); @@ -297,6 +298,6 @@ gboolean mc_util_unlink_backup_if_possible (const char *, const char *); char *guess_message_value (void); -#define MC_PTR_FREE(ptr) do { g_free(ptr); (ptr) = NULL; } while (0) +#define MC_PTR_FREE(ptr) do { g_free (ptr); (ptr) = NULL; } while (0) -#endif +#endif /* MC_UTIL_H */ -- 2.11.4.GIT