controllers: remove use of LINE_MAX
PATCH 1/1 controllers: remove use of LINE_MAX
LINE_MAX is not defined in Android's bionic and seems to be a leftover of POSIX standards. In this case, replace the use of fgets with getline, which will resize the line buffer if needed. Also, drop some unnecessarily exported variables.
Signed-off-by Edward Liaw <[email protected]>
--- .../kernel/controllers/libcontrollers/libcontrollers.c | 8 +++++--- .../kernel/controllers/libcontrollers/libcontrollers.h | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-)
testcases/kernel/controllers/libcontrollers/libcontrollers.c +5 -3
@@ -39,11 +39,9 @@ char fullpath[PATH_MAX];int FLAG ;volatile int timer_expired =0 ;int retval; -unsigned int num_line;unsigned int current_shares;unsigned int total_shares;unsigned int *shares_pointer; -char target[LINE_MAX ];struct dirent *dir_pointer;/*
@@ -133,6 +131,9 @@ int read_file(char *filepath, int action, unsigned int *value)int num_line =0 ;FILE *fp;int tmp; +size_t len; +char *target =NULL ; +switch (action) {case GET_SHARES : tmp =read_shares_file (filepath);
@@ -147,8 +148,9 @@ int read_file(char *filepath, int action, unsigned int *value)error_function ("Could not open file" , filepath);return -1 ; } -while (fgets (target,LINE_MAX , fp) !=NULL ) +while (getline (&target, &len, fp) !=-1 ) num_line++; +free (target); *value = (unsigned int )num_line;if (fclose (fp)) {error_function ("Could not close file" , filepath);
testcases/kernel/controllers/libcontrollers/libcontrollers.h +0 -2
@@ -46,11 +46,9 @@ extern char fullpath[PATH_MAX];extern int FLAG ;extern volatile int timer_expired;extern int retval; -extern unsigned int num_line;extern unsigned int current_shares;extern unsigned int total_shares;extern unsigned int *shares_pointer; -extern char target[LINE_MAX ];extern struct dirent *dir_pointer;enum {
Signature · 5 lines
2.44.0.683.g7961c838ac-goog -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Applied, thanks.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp