@@ -167,11 +167,11 @@ int setupSerial (const char *dev) {
fd = open(dev,O_RDWR | O_NDELAY );
if (fd < 0) {
- fprintf(stderr, "%s: %s\n", dev, sys_errlist[errno]);
+ fprintf(stderr, "%s: %s\n", dev, strerror(errno));
exit(1);
}
if (tcgetattr(fd, &tios) < 0) {
- fprintf(stderr,"Could not get terminal attributes: %s",sys_errlist[errno]);
+ fprintf(stderr, "Could not get terminal attributes: %s", strerror(errno));
exit(1);
}
@@ -197,7 +197,7 @@ int setupSerial (const char *dev) {
cfsetispeed (&tios, B9600);
if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) {
- fprintf(stderr,"Could not set attributes: ,%s",sys_errlist[errno]);
+ fprintf(stderr, "Could not set attributes: ,%s", strerror(errno));
exit(1);
}
return fd;
@@ -520,7 +520,7 @@ void processCmdLine(int argc, char **argv)
FileSizeMax = (float)atoi(argv[++cnt]);
if(FileSizeMax > (MAX_INTS_ALLOW*sizeof(int)))
{
- printf("Max file size allowd is %i.\n",
+ printf("Max file size allowed is %lu.\n",
MAX_INTS_ALLOW*sizeof(int));
exit(0);
}
@@ -28,7 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-
+#include <string.h>
/*
@@ -1236,7 +1236,8 @@ void tests_try_to_clear_dir(const char *dir_name)
break;
}
}
- chdir(buf);
+ if (chdir(buf) < 0)
+ perror("chdir");
closedir(dir);
}
@@ -40,8 +40,11 @@ void adjust_size(void)
total_memory = 0;
f = fopen("/proc/meminfo", "r");
- fscanf(f, "%s %lu", dummy, &total_memory);
+ if (fscanf(f, "%s %lu", dummy, &total_memory) != 2)
+ perror("fscanf error");
fclose(f);
+
+
if (total_memory > 0 && tests_size_parameter > total_memory / 2)
tests_size_parameter = total_memory / 2;
}
@@ -82,6 +82,7 @@
#include <string.h> /* strcpy, strcmp */
#include <stdlib.h> /* exit, atol, atoi */
#include <sys/time.h> /* setitimer, settimeofday, gettimeofday */
+#include <time.h> /* time */
#include <signal.h> /* signal */
#include <sched.h> /* sched_setscheduler, sched_get_priority_min,*/
/* sched_get_priority_max */
@@ -475,7 +476,9 @@ void doGrabKProfile(int jitterusec, char *fileName)
while((readBytes = read(fdProfile, readBuf, sizeof(readBuf))) > 0)
{
- write(fdSnapshot, readBuf, readBytes);
+ int writeBytes = write(fdSnapshot, readBuf, readBytes);
+ if (writeBytes < 0)
+ perror("write error");
}
close(fdSnapshot);
@@ -650,7 +653,9 @@ void AlarmHandler(
if(DoRead)
{
- read(Fd2, tmpBuf, 1);
+ cntr = read(Fd2, tmpBuf, 1);
+ if (cntr < 0)
+ perror("read error");
lseek(Fd2, 0, SEEK_SET); /* back to start */
}
@@ -1032,7 +1037,7 @@ int Write(int fd, void *buf, size_t bytes, int lineNo)
if(err < bytes)
{
- printf("Write Error at line %i! Wanted to write %i bytes, but wrote only %i bytes.\n",
+ printf("Write Error at line %i! Wanted to write %zu bytes, but wrote only %i bytes.\n",
lineNo, bytes, err);
perror("Write did not complete. Error. Bye:"); /* show error from errno. */
exit(1);
@@ -14,6 +14,7 @@
#include <sys/stat.h>
#include "libubi.h"
+#include "common.h"
struct erase_block_info;
struct volume_info;
@@ -586,7 +587,7 @@ static void reload_ubi(void)
sleep(1);
}
-static void check_volume(struct volume_info *vol)
+static void integ_check_volume(struct volume_info *vol)
{
struct erase_block_info *eb = vol->erase_blocks;
int pos;
@@ -607,7 +608,7 @@ static void check_ubi_device(struct ubi_device_info *ubi_device)
vol = ubi_device->volumes;
while (vol) {
- check_volume(vol);
+ integ_check_volume(vol);
vol = vol->next;
}
}
Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com> --- tests/checkfs/checkfs.c | 8 ++++---- tests/checkfs/comm.c | 2 +- tests/fs-tests/lib/tests.c | 3 ++- tests/fs-tests/stress/atoms/pdfrun.c | 5 ++++- tests/jittertest/JitterTest.c | 11 ++++++++--- tests/ubi-tests/integ.c | 5 +++-- 6 files changed, 22 insertions(+), 12 deletions(-)