wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove unnecessary POSIX header

Browse Source 
- change file handling from POSIX to ANSI C
This commit is contained in:
Stefan Wahren
2012-12-10 21:37:42 +01:00
parent be68f84d38
commit a266c96a2f
2 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/mbus_parse.c
View File

@ -8,23 +8,17 @@
// //
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include <sys/types.h>
#include <err.h> #include <err.h>
#include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <termios.h>
#include <unistd.h>
#include <string.h> #include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <mbus/mbus-protocol.h> #include <mbus/mbus-protocol.h>
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int fd, len; FILE *fp = NULL;
size_t buff_len, len;
u_char buf[1024]; u_char buf[1024];
mbus_frame reply; mbus_frame reply;
mbus_frame_data frame_data; mbus_frame_data frame_data;
@ -36,16 +30,15 @@ main(int argc, char *argv[])
return 1; return 1;
} }
if ((fd = open(argv[1], O_RDONLY, 0)) == -1) if ((fp = fopen(argv[1], "r")) == NULL)
{ {
fprintf(stderr, "%s: failed to open '%s'", argv[0], argv[1]); fprintf(stderr, "%s: failed to open '%s'\n", argv[0], argv[1]);
return 1; return 1;
} }
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
len = read(fd, buf, sizeof(buf)); len = fread(buf, 1, sizeof(buf), fp);
fclose(fp);
close(fd);
memset(&reply, 0, sizeof(reply)); memset(&reply, 0, sizeof(reply));
memset(&frame_data, 0, sizeof(frame_data)); memset(&frame_data, 0, sizeof(frame_data));

38
test/mbus_parse_hex.c
View File

@ -8,24 +8,19 @@
// //
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include <sys/types.h>
#include <err.h> #include <err.h>
#include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <termios.h>
#include <unistd.h>
#include <string.h> #include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <mbus/mbus-protocol.h> #include <mbus/mbus-protocol.h>
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int fd, len, i, result; FILE *fp = NULL;
u_char raw_buff[4096], buff[4096], *ptr, *endptr; size_t buff_len, len;
int result;
u_char raw_buff[4096], buff[4096];
mbus_frame reply; mbus_frame reply;
mbus_frame_data frame_data; mbus_frame_data frame_data;
char *xml_result = NULL; char *xml_result = NULL;
@ -36,37 +31,24 @@ main(int argc, char *argv[])
return 1; return 1;
} }
if ((fd = open(argv[1], O_RDONLY, 0)) == -1) if ((fp = fopen(argv[1], "r")) == NULL)
{ {
fprintf(stderr, "%s: failed to open '%s'", argv[0], argv[1]); fprintf(stderr, "%s: failed to open '%s'\n", argv[0], argv[1]);
return 1; return 1;
} }
memset(raw_buff, 0, sizeof(raw_buff)); memset(raw_buff, 0, sizeof(raw_buff));
len = read(fd, raw_buff, sizeof(raw_buff)); len = fread(raw_buff, 1, sizeof(raw_buff), fp);
close(fd); fclose(fp);
i = 0; buff_len = mbus_hex2bin(buff,sizeof(buff),raw_buff,sizeof(raw_buff));
ptr = 0;
endptr = raw_buff;
while (i < sizeof(buff)-1)
{
ptr = endptr;
buff[i] = (u_char)strtol(ptr, (char **)&endptr, 16);
// abort at non hex value
if (ptr == endptr)
break;
i++;
}
memset(&reply, 0, sizeof(reply)); memset(&reply, 0, sizeof(reply));
memset(&frame_data, 0, sizeof(frame_data)); memset(&frame_data, 0, sizeof(frame_data));
//mbus_parse_set_debug(1); //mbus_parse_set_debug(1);
result = mbus_parse(&reply, buff, i); result = mbus_parse(&reply, buff, buff_len);
if (result < 0) if (result < 0)
{ {