add abrt_ prefixes to abrt-internal functions in libabrt.so

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

4 files changed, 119 insertions, 44 deletions

diff --git a/src/include/abrt_crash_dump.h b/src/include/abrt_crash_dump.h
index 3a23285a..9ecbf56d 100644
--- a/src/include/abrt_crash_dump.h
+++ b/src/include/abrt_crash_dump.h
@@ -75,8 +75,10 @@
 extern "C" {
 #endif
 
+#define is_editable_file abrt_is_editable_file
 bool is_editable_file(const char *file_name);
 
+#define log_map_crash_data abrt_log_map_crash_data
 void log_map_crash_data(crash_data_t *crash_data, const char *pfx);
 
 #ifdef __cplusplus
diff --git a/src/include/abrt_types.h b/src/include/abrt_types.h
index 3ebd1697..858c0c79 100644
--- a/src/include/abrt_types.h
+++ b/src/include/abrt_types.h
@@ -31,8 +31,11 @@ extern "C" {
  */
 typedef GHashTable map_string_h;
 
+#define new_map_string abrt_new_map_string
 map_string_h *new_map_string(void);
+#define free_map_string abrt_free_map_string
 void free_map_string(map_string_h *ms);
+#define get_map_string_item_or_empty abrt_get_map_string_item_or_empty
 const char *get_map_string_item_or_empty(map_string_h *ms, const char *key);
 static inline
 const char *get_map_string_item_or_NULL(map_string_h *ms, const char *key)
diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h
index d8dd361a..d3f355e9 100644
--- a/src/include/abrtlib.h
+++ b/src/include/abrtlib.h
@@ -87,43 +87,64 @@ int vdprintf(int d, const char *format, va_list ap);
 extern "C" {
 #endif
 
+#define prefixcmp abrt_prefixcmp
 int prefixcmp(const char *str, const char *prefix);
+#define suffixcmp abrt_suffixcmp
 int suffixcmp(const char *str, const char *suffix);
+#define concat_path_file abrt_concat_path_file
 char *concat_path_file(const char *path, const char *filename);
+#define append_to_malloced_string abrt_append_to_malloced_string
 char *append_to_malloced_string(char *mstr, const char *append);
+#define skip_whitespace abrt_skip_whitespace
 char* skip_whitespace(const char *s);
+#define skip_non_whitespace abrt_skip_non_whitespace
 char* skip_non_whitespace(const char *s);
 /* Like strcpy but can copy overlapping strings. */
+#define overlapping_strcpy abrt_overlapping_strcpy
 void overlapping_strcpy(char *dst, const char *src);
 
 /* A-la fgets, but malloced and of unlimited size */
+#define xmalloc_fgets abrt_xmalloc_fgets
 char *xmalloc_fgets(FILE *file);
 /* Similar, but removes trailing \n */
+#define xmalloc_fgetline abrt_xmalloc_fgetline
 char *xmalloc_fgetline(FILE *file);
 
 /* On error, copyfd_XX prints error messages and returns -1 */
 enum {
 	COPYFD_SPARSE = 1 << 0,
 };
+#define copyfd_eof abrt_copyfd_eof
 off_t copyfd_eof(int src_fd, int dst_fd, int flags);
+#define copyfd_size abrt_copyfd_size
 off_t copyfd_size(int src_fd, int dst_fd, off_t size, int flags);
+#define copyfd_exact_size abrt_copyfd_exact_size
 void copyfd_exact_size(int src_fd, int dst_fd, off_t size);
+#define copy_file abrt_copy_file
 off_t copy_file(const char *src_name, const char *dst_name, int mode);
 
 /* Returns malloc'ed block */
+#define encode_base64 abrt_encode_base64
 char *encode_base64(const void *src, int length);
 
+#define xatou abrt_xatou
 unsigned xatou(const char *numstr);
+#define xatoi abrt_xatoi
 int xatoi(const char *numstr);
 /* Using xatoi() instead of naive atoi() is not always convenient -
  * in many places people want *non-negative* values, but store them
  * in signed int. Therefore we need this one:
- * dies if input is not in [0, INT_MAX] range. Also will reject '-0' etc */
-int xatoi_u(const char *numstr);
+ * dies if input is not in [0, INT_MAX] range. Also will reject '-0' etc.
+ * It should really be named xatoi_nonnegative (since it allows 0),
+ * but that would be too long.
+ */
+#define xatoi_positive abrt_xatoi_positive
+int xatoi_positive(const char *numstr);
 
-unsigned long long monotonic_ns(void);
-unsigned long long monotonic_us(void);
-unsigned monotonic_sec(void);
+//unused for now
+//unsigned long long monotonic_ns(void);
+//unsigned long long monotonic_us(void);
+//unsigned monotonic_sec(void);
 
 enum {
 	/* on return, pipefds[1] is fd to which parent may write
@@ -146,6 +167,7 @@ enum {
 	EXECFLG_SETSID     = 1 << 8,
 };
 /* Returns pid */
+#define fork_execv_on_steroids abrt_fork_execv_on_steroids
 pid_t fork_execv_on_steroids(int flags,
                 char **argv,
                 int *pipefds,
@@ -154,53 +176,57 @@ pid_t fork_execv_on_steroids(int flags,
                 uid_t uid);
 /* Returns malloc'ed string. NULs are retained, and extra one is appended
  * after the last byte (this NUL is not accounted for in *size_p) */
+#define run_in_shell_and_save_output abrt_run_in_shell_and_save_output
 char *run_in_shell_and_save_output(int flags,
 		const char *cmd,
 		const char *dir,
 		size_t *size_p);
 
-/* Networking helpers */
-typedef struct len_and_sockaddr {
-	socklen_t len;
-	union {
-		struct sockaddr sa;
-		struct sockaddr_in sin;
-		struct sockaddr_in6 sin6;
-	} u;
-} len_and_sockaddr;
-enum {
-	LSA_LEN_SIZE = offsetof(len_and_sockaddr, u),
-	LSA_SIZEOF_SA = sizeof(struct sockaddr) > sizeof(struct sockaddr_in6) ?
-			sizeof(struct sockaddr) : sizeof(struct sockaddr_in6),
-};
-void setsockopt_reuseaddr(int fd);
-int setsockopt_broadcast(int fd);
-int setsockopt_bindtodevice(int fd, const char *iface);
-len_and_sockaddr* get_sock_lsa(int fd);
-void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen);
-unsigned lookup_port(const char *port, const char *protocol, unsigned default_port);
-int get_nport(const struct sockaddr *sa);
-void set_nport(len_and_sockaddr *lsa, unsigned port);
-len_and_sockaddr* host_and_af2sockaddr(const char *host, int port, sa_family_t af);
-len_and_sockaddr* xhost_and_af2sockaddr(const char *host, int port, sa_family_t af);
-len_and_sockaddr* host2sockaddr(const char *host, int port);
-len_and_sockaddr* xhost2sockaddr(const char *host, int port);
-len_and_sockaddr* xdotted2sockaddr(const char *host, int port);
-int xsocket_type(len_and_sockaddr **lsap, int family, int sock_type);
-int xsocket_stream(len_and_sockaddr **lsap);
-int create_and_bind_stream_or_die(const char *bindaddr, int port);
-int create_and_bind_dgram_or_die(const char *bindaddr, int port);
-int create_and_connect_stream_or_die(const char *peer, int port);
-int xconnect_stream(const len_and_sockaddr *lsa);
-char* xmalloc_sockaddr2host(const struct sockaddr *sa);
-char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa);
-char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa);
-char* xmalloc_sockaddr2dotted(const struct sockaddr *sa);
-char* xmalloc_sockaddr2dotted_noport(const struct sockaddr *sa);
+//unused for now
+///* Networking helpers */
+//typedef struct len_and_sockaddr {
+//	socklen_t len;
+//	union {
+//		struct sockaddr sa;
+//		struct sockaddr_in sin;
+//		struct sockaddr_in6 sin6;
+//	} u;
+//} len_and_sockaddr;
+//enum {
+//	LSA_LEN_SIZE = offsetof(len_and_sockaddr, u),
+//	LSA_SIZEOF_SA = sizeof(struct sockaddr) > sizeof(struct sockaddr_in6) ?
+//			sizeof(struct sockaddr) : sizeof(struct sockaddr_in6),
+//};
+//void setsockopt_reuseaddr(int fd);
+//int setsockopt_broadcast(int fd);
+//int setsockopt_bindtodevice(int fd, const char *iface);
+//len_and_sockaddr* get_sock_lsa(int fd);
+//void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen);
+//unsigned lookup_port(const char *port, const char *protocol, unsigned default_port);
+//int get_nport(const struct sockaddr *sa);
+//void set_nport(len_and_sockaddr *lsa, unsigned port);
+//len_and_sockaddr* host_and_af2sockaddr(const char *host, int port, sa_family_t af);
+//len_and_sockaddr* xhost_and_af2sockaddr(const char *host, int port, sa_family_t af);
+//len_and_sockaddr* host2sockaddr(const char *host, int port);
+//len_and_sockaddr* xhost2sockaddr(const char *host, int port);
+//len_and_sockaddr* xdotted2sockaddr(const char *host, int port);
+//int xsocket_type(len_and_sockaddr **lsap, int family, int sock_type);
+//int xsocket_stream(len_and_sockaddr **lsap);
+//int create_and_bind_stream_or_die(const char *bindaddr, int port);
+//int create_and_bind_dgram_or_die(const char *bindaddr, int port);
+//int create_and_connect_stream_or_die(const char *peer, int port);
+//int xconnect_stream(const len_and_sockaddr *lsa);
+//char* xmalloc_sockaddr2host(const struct sockaddr *sa);
+//char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa);
+//char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa);
+//char* xmalloc_sockaddr2dotted(const struct sockaddr *sa);
+//char* xmalloc_sockaddr2dotted_noport(const struct sockaddr *sa);
 
 /* Random utility functions */
 
+#define get_dirsize abrt_get_dirsize
 double get_dirsize(const char *pPath);
+#define get_dirsize_find_largest_dir abrt_get_dirsize_find_largest_dir
 double get_dirsize_find_largest_dir(
                 const char *pPath,
                 char **worst_dir, /* can be NULL */
@@ -212,16 +238,23 @@ double get_dirsize_find_largest_dir(
  * If the pid is not valid or command line can not be obtained,
  * empty string is returned.
  */
+#define get_cmdline abrt_get_cmdline
 char* get_cmdline(pid_t pid);
 
 /* Returns 1 if abrtd daemon is running, 0 otherwise. */
+#define daemon_is_ok abrt_daemon_is_ok
 int daemon_is_ok();
 
+#define make_description_bz abrt_make_description_bz
 char* make_description_bz(crash_data_t *crash_data);
+#define make_description_reproduce_comment abrt_make_description_reproduce_comment
 char* make_description_reproduce_comment(crash_data_t *crash_data);
+#define make_description_logger abrt_make_description_logger
 char* make_description_logger(crash_data_t *crash_data);
+#define make_description_mailx abrt_make_description_mailx
 char* make_description_mailx(crash_data_t *crash_data);
 
+#define parse_release abrt_parse_release
 void parse_release(const char *pRelease, char **product, char **version);
 
 /**
@@ -236,6 +269,7 @@ void parse_release(const char *pRelease, char **product, char **version);
  *  Otherwise empty value "" is inserted into pSettings.
  * @return if it success it returns true, otherwise it returns false.
  */
+#define load_conf_file abrt_load_conf_file
 bool load_conf_file(const char *pPath, map_string_h *settings, bool skipKeysWithoutValue);
 
 #ifdef __cplusplus
diff --git a/src/include/xfuncs.h b/src/include/xfuncs.h
index 20284564..61188c81 100644
--- a/src/include/xfuncs.h
+++ b/src/include/xfuncs.h
@@ -29,43 +29,69 @@
 extern "C" {
 #endif
 
+#define ndelay_on abrt_ndelay_on
 int ndelay_on(int fd);
+#define ndelay_off abrt_ndelay_off
 int ndelay_off(int fd);
+#define close_on_exec_on abrt_close_on_exec_on
 int close_on_exec_on(int fd);
 
-void* xcalloc(size_t nmemb, size_t size);
+#define xmalloc abrt_xmalloc
 void* xmalloc(size_t size);
+#define xrealloc abrt_xrealloc
 void* xrealloc(void *ptr, size_t size);
+#define xzalloc abrt_xzalloc
 void* xzalloc(size_t size);
+#define xstrdup abrt_xstrdup
 char* xstrdup(const char *s);
+#define xstrndup abrt_xstrndup
 char* xstrndup(const char *s, int n);
 
+#define xpipe abrt_xpipe
 void xpipe(int filedes[2]);
+#define xdup abrt_xdup
 void xdup(int from);
+#define xdup2 abrt_xdup2
 void xdup2(int from, int to);
+#define xmove_fd abrt_xmove_fd
 void xmove_fd(int from, int to);
 
+#define xwrite abrt_xwrite
 void xwrite(int fd, const void *buf, size_t count);
+#define xwrite_str abrt_xwrite_str
 void xwrite_str(int fd, const char *str);
 
+#define xlseek abrt_xlseek
 off_t xlseek(int fd, off_t offset, int whence);
 
+#define xchdir abrt_xchdir
 void xchdir(const char *path);
 
+#define xvasprintf abrt_xvasprintf
 char* xvasprintf(const char *format, va_list p);
+#define xasprintf abrt_xasprintf
 char* xasprintf(const char *format, ...);
 
+#define xsetenv abrt_xsetenv
 void xsetenv(const char *key, const char *value);
+#define xsocket abrt_xsocket
 int xsocket(int domain, int type, int protocol);
+#define xbind abrt_xbind
 void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen);
+#define xlisten abrt_xlisten
 void xlisten(int s, int backlog);
+#define xsendto abrt_xsendto
 ssize_t xsendto(int s, const void *buf, size_t len,
                 const struct sockaddr *to, socklen_t tolen);
 
+#define xstat abrt_xstat
 void xstat(const char *name, struct stat *stat_buf);
 
+#define xopen3 abrt_xopen3
 int xopen3(const char *pathname, int flags, int mode);
+#define xopen abrt_xopen
 int xopen(const char *pathname, int flags);
+#define xunlink abrt_xunlink
 void xunlink(const char *pathname);
 
 /* Just testing dent->d_type == DT_REG is wrong: some filesystems
@@ -74,18 +100,28 @@ void xunlink(const char *pathname);
  * This function handles this case. Note: it returns 0 on symlinks
  * even if they point to regular files.
  */
+#define is_regular_file abrt_is_regular_file
 int is_regular_file(struct dirent *dent, const char *dirname);
+
+#define dot_or_dotdot abrt_dot_or_dotdot
 bool dot_or_dotdot(const char *filename);
+#define last_char_is abrt_last_char_is
 char *last_char_is(const char *s, int c);
 
+#define string_to_bool abrt_string_to_bool
 bool string_to_bool(const char *s);
 
+#define xseteuid abrt_xseteuid
 void xseteuid(uid_t euid);
+#define xsetegid abrt_xsetegid
 void xsetegid(gid_t egid);
+#define xsetreuid abrt_xsetreuid
 void xsetreuid(uid_t ruid, uid_t euid);
+#define xsetregid abrt_xsetregid
 void xsetregid(gid_t rgid, gid_t egid);
 
 /* Returns getpwuid(uid)->pw_dir or NULL */
+#define get_home_dir abrt_get_home_dir
 const char *get_home_dir(uid_t uid);
 
 #ifdef __cplusplus