RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

sys/shell: use more common libc calls

Browse Source 
use strtol instead of sscanf
use plain printf instead of asctime
This commit is contained in:
Ludwig Ortmann 2014-12-15 13:20:30 +01:00
parent 4942882949
commit 3729789dc3
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/shell/commands/sc_rtc.c
View File

@ -23,6 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <stdlib.h>
#include "periph/rtc.h" #include "periph/rtc.h"
@ -45,21 +46,20 @@ static int dow(int year, int month, int day)
static int _parse_time(char **argv, struct tm *time) static int _parse_time(char **argv, struct tm *time)
{ {
short i1, i2, i3; short i1, i2, i3;
char *end;
if(sscanf(argv[0], "%6hd-%6hd-%6hd", &i1, &i2, &i3) != 3) { i1 = strtol(argv[0], &end, 10);
puts("could not parse date"); i2 = strtol(end + 1, &end, 10);
return -1; i3 = strtol(end + 1, &end, 10);
}
time->tm_year = i1 - 1900; time->tm_year = i1 - 1900;
time->tm_mon = i2 - 1; time->tm_mon = i2 - 1;
time->tm_mday = i3; time->tm_mday = i3;
time->tm_wday = dow(i1, i2, i3); time->tm_wday = dow(i1, i2, i3);
if(sscanf(argv[1], "%6hd:%6hd:%6hd", &i1, &i2, &i3) != 3) { i1 = strtol(argv[1], &end, 10);
puts("could not parse time"); i2 = strtol(end + 1, &end, 10);
return -1; i3 = strtol(end + 1, &end, 10);
}
time->tm_hour = i1; time->tm_hour = i1;
time->tm_min = i2; time->tm_min = i2;
@ -70,13 +70,19 @@ static int _parse_time(char **argv, struct tm *time)
return 0; return 0;
} }
static void _print_time(struct tm *time)
{
printf("%04i-%02i-%02i %02i:%02i:%02i\n",
time->tm_year + 1900, time->tm_mon + 1, time->tm_mday,
time->tm_hour, time->tm_min, time->tm_sec
);
}
static void _rtc_getalarm(void) static void _rtc_getalarm(void)
{ {
struct tm now; struct tm t;
if (rtc_get_alarm(&now) == 0) { if (rtc_get_alarm(&t) == 0) {
/* cppcheck: see man 3 asctime: obsoleted by POSIX.1-2008 */ _print_time(&t);
/* cppcheck-suppress obsoleteFunctionsasctime */
printf("%s", asctime(&now));
} }
else { else {
puts("rtc: error getting alarm"); puts("rtc: error getting alarm");
@ -96,11 +102,9 @@ static void _rtc_setalarm(char **argv)
static void _rtc_gettime(void) static void _rtc_gettime(void)
{ {
struct tm now; struct tm t;
if (rtc_get_time(&now) == 0) { if (rtc_get_time(&t) == 0) {
/* cppcheck: see man 3 asctime: obsoleted by POSIX.1-2008 */ _print_time(&t);
/* cppcheck-suppress obsoleteFunctionsasctime */
printf("%s", asctime(&now));
} }
else { else {
puts("rtc: error getting time"); puts("rtc: error getting time");