git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In the daemon, change all const char * parameters to char *.
[libguestfs.git]
/
daemon
/
strings.c
diff --git
a/daemon/strings.c
b/daemon/strings.c
index
5e9c3a8
..
d78f9fd
100644
(file)
--- a/
daemon/strings.c
+++ b/
daemon/strings.c
@@
-26,15
+26,13
@@
#include "actions.h"
char **
#include "actions.h"
char **
-do_strings_e (c
onst char *encoding, const
char *path)
+do_strings_e (c
har *encoding,
char *path)
{
int len;
char *buf;
int r;
char *out, *err;
{
int len;
char *buf;
int r;
char *out, *err;
- char **lines = NULL;
- int size = 0, alloc = 0;
- char *p, *pend;
+ char **lines;
NEED_ROOT (NULL);
ABS_PATH (path, NULL);
NEED_ROOT (NULL);
ABS_PATH (path, NULL);
@@
-60,32
+58,17
@@
do_strings_e (const char *encoding, const char *path)
free (err);
/* Now convert the output to a list of lines. */
free (err);
/* Now convert the output to a list of lines. */
- p = out;
- while (p && *p) {
- pend = strchr (p, '\n');
- if (pend) {
- *pend = '\0';
- pend++;
- }
-
- if (add_string (&lines, &size, &alloc, p) == -1) {
- free (out);
- return NULL;
- }
-
- p = pend;
- }
-
+ lines = split_lines (out);
free (out);
free (out);
- if (
add_string (&lines, &size, &alloc, NULL) == -1
)
+ if (
lines == NULL
)
return NULL;
return lines; /* Caller frees. */
}
char **
return NULL;
return lines; /* Caller frees. */
}
char **
-do_strings (c
onst c
har *path)
+do_strings (char *path)
{
return do_strings_e ("s", path);
}
{
return do_strings_e ("s", path);
}