1 files changed, 29 insertions, 31 deletions

diff --git a/src/pacman/util.h b/src/pacman/util.h
index 6eba38fe..0295d7e5 100644
--- a/src/pacman/util.h
+++ b/src/pacman/util.h
@@ -1,8 +1,8 @@
 /*
  *  util.h
- * 
- *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
- * 
+ *
+ *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.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
@@ -15,52 +15,50 @@
  *
  *  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 #ifndef _PM_UTIL_H
 #define _PM_UTIL_H
 
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
-#include <libintl.h>
 
 #include <alpm_list.h>
 
-#define MALLOC(p, b) do { \
-	if((b) > 0) { \
-		p = malloc(b); \
-		if (!(p)) { \
-			fprintf(stderr, "malloc failure: could not allocate %d bytes\n", (int)b); \
-			exit(EXIT_FAILURE); \
-		} \
-	} else { \
-		p = NULL; \
-	} \
-} while(0)
-
-#define FREE(p) do { if (p) { free(p); (p) = NULL; }} while(0)
-
-#define STRNCPY(s1, s2, len) do { \
-	strncpy(s1, s2, (len)-1); \
-	s1[(len)-1] = 0; \
-} while(0)
+#ifdef ENABLE_NLS
+#include <libintl.h> /* here so it doesn't need to be included elsewhere */
+/* define _() as shortcut for gettext() */
+#define _(str) gettext(str)
+#else
+#define _(str) str
+#endif
 
 /* update speed for the fill_progress based functions */
 #define UPDATE_SPEED_SEC 0.2f
 
-#define _(str) gettext(str)
+int needs_transaction();
 int getcols();
-int makepath(char *path);
-int rmrf(char *path);
+int makepath(const char *path);
+int rmrf(const char *path);
+char *mbasename(const char *path);
 void indentprint(const char *str, int indent);
 char *strtoupper(char *str);
 char *strtrim(char *str);
-int reg_match(char *string, char *pattern);
-void list_display(const char *title, alpm_list_t *list);
-void display_targets(alpm_list_t *syncpkgs);
-float get_update_timediff(int first_call);
-void fill_progress(const int percent, const int proglen);
+char *strreplace(const char *str, const char *needle, const char *replace);
+alpm_list_t *strsplit(const char *str, const char splitchar);
+void string_display(const char *title, const char *string);
+void list_display(const char *title, const alpm_list_t *list);
+void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local);
+int yesno(char *fmt, ...);
+int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3)));
+int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) __attribute__((format(printf,3,4)));
+int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0)));
+
+#ifndef HAVE_STRNDUP
+char *strndup(const char *s, size_t n);
+#endif
 
 #endif /* _PM_UTIL_H */