Skip to content
Snippets Groups Projects
Commit 3f210257 authored by komaln's avatar komaln
Browse files

b=14971

r=Adilger
to solve RHEL5/ia64 build error related to 'lctl {get,set}_param' patch
parent 36a859cf
No related branches found
No related tags found
No related merge requests found
...@@ -548,8 +548,8 @@ int jt_lcfg_getparam(int argc, char **argv) ...@@ -548,8 +548,8 @@ int jt_lcfg_getparam(int argc, char **argv)
{ {
int fp; int fp;
int rc = 0, i, show_path = 0; int rc = 0, i, show_path = 0;
char buf[CFS_PAGE_SIZE] = {'\0'}, pattern[PATH_MAX]; char pattern[PATH_MAX];
char *path, *tmp; char *path, *tmp, *buf;
glob_t glob_info; glob_t glob_info;
if (argc == 3 && strcmp(argv[1], "-n") == 0) { if (argc == 3 && strcmp(argv[1], "-n") == 0) {
...@@ -587,8 +587,11 @@ int jt_lcfg_getparam(int argc, char **argv) ...@@ -587,8 +587,11 @@ int jt_lcfg_getparam(int argc, char **argv)
return rc; return rc;
} }
buf = malloc(CFS_PAGE_SIZE);
for (i = 0; i < glob_info.gl_pathc; i++) { for (i = 0; i < glob_info.gl_pathc; i++) {
char *valuename = NULL; char *valuename = NULL;
memset(buf, 0, CFS_PAGE_SIZE);
if (show_path) { if (show_path) {
char *filename; char *filename;
filename = strdup(glob_info.gl_pathv[i]); filename = strdup(glob_info.gl_pathv[i]);
...@@ -605,7 +608,7 @@ int jt_lcfg_getparam(int argc, char **argv) ...@@ -605,7 +608,7 @@ int jt_lcfg_getparam(int argc, char **argv)
} }
do { do {
rc = read(fp, buf, sizeof(buf)); rc = read(fp, buf, CFS_PAGE_SIZE);
if (rc == 0) if (rc == 0)
break; break;
if (rc < 0) { if (rc < 0) {
...@@ -634,11 +637,11 @@ int jt_lcfg_getparam(int argc, char **argv) ...@@ -634,11 +637,11 @@ int jt_lcfg_getparam(int argc, char **argv)
break; break;
} }
} while (1); } while (1);
memset(buf, 0, sizeof(buf));
close(fp); close(fp);
} }
globfree(&glob_info); globfree(&glob_info);
free(buf);
return rc; return rc;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment