use libname as prefix for all funcs (d25cfba) - uproctrace · BlinkenArea

use libname as prefix for all funcs

Stefan Schuermans commited on 2020-05-17 18:59:26
Showing 5 changed files, with 15 additions and 14 deletions.

liblwptev/src/proc_begin.c 462eae7..f99444e
liblwptev/src/stringlist.c a1b65dd..9e438a9
liblwptev/src/stringlist.h d739a1e..a684329
liblwptev/src/symlink.c d3f39e8..aef30fb
liblwptev/src/symlink.h 84602cb..a58f6a3

@@ -27,17 +27,17 @@ int lwptev_proc_begin(void **data, size_t *size) {
   proc_begin.pid = getpid();
   proc_begin.has_ppid = 1;
   proc_begin.ppid = getppid();
-  if (symlink_read("/proc/self/exe", &proc_begin.exe, cleaner) != 0) {
+  if (lwptev_symlink_read("/proc/self/exe", &proc_begin.exe, cleaner) != 0) {
     return -1;
   }
-  if (symlink_read("/proc/self/cwd", &proc_begin.cwd, cleaner) != 0) {
+  if (lwptev_symlink_read("/proc/self/cwd", &proc_begin.cwd, cleaner) != 0) {
     return -1;
   }
-  if (stringlist_read("/proc/self/cmdline", &proc_begin.n_cmdline,
+  if (lwptev_stringlist_read("/proc/self/cmdline", &proc_begin.n_cmdline,
                              &proc_begin.cmdline, cleaner) != 0) {
     return -1;
   }
-  if (stringlist_read("/proc/self/environ", &proc_begin.n_environ,
+  if (lwptev_stringlist_read("/proc/self/environ", &proc_begin.n_environ,
                              &proc_begin.environ, cleaner) != 0) {
     return -1;
   }

liblwptev/src/stringlist.c

View file @ d25cfba

@@ -14,7 +14,7 @@
  * @param[out] *size size of file contents
  * @return pointer to malloc-ed file contents or NULL
  */
-static char * stringlist_read_file(char const *pathname, size_t *size) {
+static char * lwptev_stringlist_read_file(char const *pathname, size_t *size) {
   /* it is not possible to get file size before, because this yields zero for
      files like /proc/self/cmdline */
   *size = 0;
@@ -71,7 +71,8 @@ static char * stringlist_read_file(char const *pathname, size_t *size) {
  * @param[out] *cnt number of entries in array
  * @return pointer to malloc-ed array of NULL
  */
-static char ** stringlist_make_ptrs(char *data, size_t sz, size_t *cnt) {
+static char ** lwptev_stringlist_make_ptrs(char *data, size_t sz,
+                                           size_t *cnt) {
   /* count strings */
   size_t pos = 0;
   *cnt = 0;
@@ -94,13 +95,13 @@ static char ** stringlist_make_ptrs(char *data, size_t sz, size_t *cnt) {
   return ptrs;
 }
 
-int stringlist_read(char const *pathname, size_t *n, char ***strs,
+int lwptev_stringlist_read(char const *pathname, size_t *n, char ***strs,
                            lwptev_cleaner_t *cleaner) {
   *n = 0;
   *strs = NULL;
   /* read file contents */
   size_t sz;
-  char *data = stringlist_read_file(pathname, &sz);
+  char *data = lwptev_stringlist_read_file(pathname, &sz);
   if (! data) {
     lwptev_cleaner_cleanup(cleaner);
     return -1;
@@ -108,7 +109,7 @@ int stringlist_read(char const *pathname, size_t *n, char ***strs,
   lwptev_cleaner_add_ptr(cleaner, data);
   /* create pointer array */
   size_t cnt;
-  char **ptrs = stringlist_make_ptrs(data, sz, &cnt);
+  char **ptrs = lwptev_stringlist_make_ptrs(data, sz, &cnt);
   if (! ptrs) {
     lwptev_cleaner_cleanup(cleaner);
     return -1;

liblwptev/src/stringlist.h

View file @ d25cfba

@@ -14,7 +14,7 @@
  * @return 0 on success, -1 on error
  *         (on error, cleanup is done and cleaner is deallocated)
  */
-int stringlist_read(char const *pathname, size_t *n, char ***strs,
+int lwptev_stringlist_read(char const *pathname, size_t *n, char ***strs,
                            lwptev_cleaner_t *cleaner);
 
 #endif /* #ifndef LWPTTR_STRINGLIST_H */

liblwptev/src/symlink.c

View file @ d25cfba

@@ -9,7 +9,7 @@
  * @param[in] pathname path to symbolic link
  * @return malloc-ed string containting link target or NULL
  */
-static char * symlink_read_target(char const *pathname) {
+static char * lwptev_symlink_read_target(char const *pathname) {
   size_t sz = 256;
   char *target = NULL;
   while (1) {
@@ -35,9 +35,9 @@ static char * symlink_read_target(char const *pathname) {
   }
 }
 
-int symlink_read(char const *pathname, char **target,
+int lwptev_symlink_read(char const *pathname, char **target,
                         lwptev_cleaner_t *cleaner) {
-  *target = symlink_read_target(pathname);
+  *target = lwptev_symlink_read_target(pathname);
   if (! *target) {
     lwptev_cleaner_cleanup(cleaner);
     return -1;

liblwptev/src/symlink.h

View file @ d25cfba

@@ -11,7 +11,7 @@
  * @return 0 on success, -1 on error
  *         (on error, cleanup is done and cleaner is deallocated)
  */
-int symlink_read(char const *pathname, char **target,
+int lwptev_symlink_read(char const *pathname, char **target,
                         lwptev_cleaner_t *cleaner);
 
 #endif /* #ifndef LWPTTR_SYMLINK_H */


...	...	@@ -27,17 +27,17 @@ int lwptev_proc_begin(void *data, size_t size) {
27	27	proc_begin.pid = getpid();
28	28	proc_begin.has_ppid = 1;
29	29	proc_begin.ppid = getppid();
30		- if (symlink_read("/proc/self/exe", &proc_begin.exe, cleaner) != 0) {
	30	+ if (lwptev_symlink_read("/proc/self/exe", &proc_begin.exe, cleaner) != 0) {
31	31	return -1;
32	32	}
33		- if (symlink_read("/proc/self/cwd", &proc_begin.cwd, cleaner) != 0) {
	33	+ if (lwptev_symlink_read("/proc/self/cwd", &proc_begin.cwd, cleaner) != 0) {
34	34	return -1;
35	35	}
36		- if (stringlist_read("/proc/self/cmdline", &proc_begin.n_cmdline,
	36	+ if (lwptev_stringlist_read("/proc/self/cmdline", &proc_begin.n_cmdline,
37	37	&proc_begin.cmdline, cleaner) != 0) {
38	38	return -1;
39	39	}
40		- if (stringlist_read("/proc/self/environ", &proc_begin.n_environ,
	40	+ if (lwptev_stringlist_read("/proc/self/environ", &proc_begin.n_environ,
41	41	&proc_begin.environ, cleaner) != 0) {
42	42	return -1;
43	43	}

...	...	@@ -14,7 +14,7 @@
14	14	* @param[out] *size size of file contents
15	15	* @return pointer to malloc-ed file contents or NULL
16	16	*/
17		-static char * stringlist_read_file(char const pathname, size_t size) {
	17	+static char * lwptev_stringlist_read_file(char const pathname, size_t size) {
18	18	/* it is not possible to get file size before, because this yields zero for
19	19	files like /proc/self/cmdline */
20	20	*size = 0;
...	...	@@ -71,7 +71,8 @@ static char * stringlist_read_file(char const pathname, size_t size) {
71	71	* @param[out] *cnt number of entries in array
72	72	* @return pointer to malloc-ed array of NULL
73	73	*/
74		-static char ** stringlist_make_ptrs(char data, size_t sz, size_t cnt) {
	74	+static char ** lwptev_stringlist_make_ptrs(char *data, size_t sz,
	75	+ size_t *cnt) {
75	76	/* count strings */
76	77	size_t pos = 0;
77	78	*cnt = 0;
...	...	@@ -94,13 +95,13 @@ static char ** stringlist_make_ptrs(char data, size_t sz, size_t cnt) {
94	95	return ptrs;
95	96	}
96	97
97		-int stringlist_read(char const pathname, size_t n, char ***strs,
	98	+int lwptev_stringlist_read(char const pathname, size_t n, char ***strs,
98	99	lwptev_cleaner_t *cleaner) {
99	100	*n = 0;
100	101	*strs = NULL;
101	102	/* read file contents */
102	103	size_t sz;
103		- char *data = stringlist_read_file(pathname, &sz);
	104	+ char *data = lwptev_stringlist_read_file(pathname, &sz);
104	105	if (! data) {
105	106	lwptev_cleaner_cleanup(cleaner);
106	107	return -1;
...	...	@@ -108,7 +109,7 @@ int stringlist_read(char const pathname, size_t n, char ***strs,
108	109	lwptev_cleaner_add_ptr(cleaner, data);
109	110	/* create pointer array */
110	111	size_t cnt;
111		- char **ptrs = stringlist_make_ptrs(data, sz, &cnt);
	112	+ char **ptrs = lwptev_stringlist_make_ptrs(data, sz, &cnt);
112	113	if (! ptrs) {
113	114	lwptev_cleaner_cleanup(cleaner);
114	115	return -1;

...	...	@@ -14,7 +14,7 @@
14	14	* @return 0 on success, -1 on error
15	15	* (on error, cleanup is done and cleaner is deallocated)
16	16	*/
17		-int stringlist_read(char const pathname, size_t n, char ***strs,
	17	+int lwptev_stringlist_read(char const pathname, size_t n, char ***strs,
18	18	lwptev_cleaner_t *cleaner);
19	19
20	20	#endif /* #ifndef LWPTTR_STRINGLIST_H */

...	...	@@ -9,7 +9,7 @@
9	9	* @param[in] pathname path to symbolic link
10	10	* @return malloc-ed string containting link target or NULL
11	11	*/
12		-static char * symlink_read_target(char const *pathname) {
	12	+static char * lwptev_symlink_read_target(char const *pathname) {
13	13	size_t sz = 256;
14	14	char *target = NULL;
15	15	while (1) {
...	...	@@ -35,9 +35,9 @@ static char * symlink_read_target(char const *pathname) {
35	35	}
36	36	}
37	37
38		-int symlink_read(char const pathname, char *target,
	38	+int lwptev_symlink_read(char const pathname, char *target,
39	39	lwptev_cleaner_t *cleaner) {
40		- *target = symlink_read_target(pathname);
	40	+ *target = lwptev_symlink_read_target(pathname);
41	41	if (! *target) {
42	42	lwptev_cleaner_cleanup(cleaner);
43	43	return -1;

...	...	@@ -11,7 +11,7 @@
11	11	* @return 0 on success, -1 on error
12	12	* (on error, cleanup is done and cleaner is deallocated)
13	13	*/
14		-int symlink_read(char const pathname, char *target,
	14	+int lwptev_symlink_read(char const pathname, char *target,
15	15	lwptev_cleaner_t *cleaner);
16	16
17	17	#endif /* #ifndef LWPTTR_SYMLINK_H */
18	18