提交 ad859090 编写于 作者: C Cole Robinson

tests: Remove unused virtTestClearLineRegex

This was only used for test 'xml blanking', which has now all
been removed, and isn't an ideal paradigm anyways since it
inhibits easy XML regeneration.
上级 1064fb33
...@@ -942,51 +942,6 @@ int virtTestMain(int argc, ...@@ -942,51 +942,6 @@ int virtTestMain(int argc,
} }
int virtTestClearLineRegex(const char *pattern,
char *str)
{
regex_t reg;
char *lineStart = str;
char *lineEnd = strchr(str, '\n');
if (regcomp(&reg, pattern, REG_EXTENDED | REG_NOSUB) != 0)
return -1;
while (lineStart) {
int ret;
if (lineEnd)
*lineEnd = '\0';
ret = regexec(&reg, lineStart, 0, NULL, 0);
//fprintf(stderr, "Match %d '%s' '%s'\n", ret, lineStart, pattern);
if (ret == 0) {
if (lineEnd) {
memmove(lineStart, lineEnd + 1, strlen(lineEnd+1) + 1);
/* Don't update lineStart - just iterate again on this
location */
lineEnd = strchr(lineStart, '\n');
} else {
*lineStart = '\0';
lineStart = NULL;
}
} else {
if (lineEnd) {
*lineEnd = '\n';
lineStart = lineEnd + 1;
lineEnd = strchr(lineStart, '\n');
} else {
lineStart = NULL;
}
}
}
regfree(&reg);
return 0;
}
/* /*
* @cmdset contains a list of command line args, eg * @cmdset contains a list of command line args, eg
* *
......
...@@ -54,9 +54,6 @@ int virtTestRun(const char *title, ...@@ -54,9 +54,6 @@ int virtTestRun(const char *title,
int virtTestLoadFile(const char *file, char **buf); int virtTestLoadFile(const char *file, char **buf);
int virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen); int virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen);
int virtTestClearLineRegex(const char *pattern,
char *string);
void virtTestClearCommandPath(char *cmdset); void virtTestClearCommandPath(char *cmdset);
int virtTestDifference(FILE *stream, int virtTestDifference(FILE *stream,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册