From: Marc Kleine-Budde Date: Mon, 13 Jun 2016 08:35:26 +0000 (+0200) Subject: Merge pull request #23 from ajneu/master1 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-utils.git/commitdiff_plain/862e8ed1780014069797c3c2bb7d13594246822a?hp=b70a76670dbe8925c2a7c75f90d36a28a8878d7a Merge pull request #23 from ajneu/master1 pointer to const in lib --- diff --git a/lib.c b/lib.c index 973be52..fe18e0f 100644 --- a/lib.c +++ b/lib.c @@ -519,14 +519,14 @@ static int snprintf_error_data(char *buf, size_t len, uint8_t err, return n; } -static int snprintf_error_lostarb(char *buf, size_t len, struct canfd_frame *cf) +static int snprintf_error_lostarb(char *buf, size_t len, const struct canfd_frame *cf) { if (len <= 0) return 0; return snprintf(buf, len, "{at bit %d}", cf->data[0]); } -static int snprintf_error_ctrl(char *buf, size_t len, struct canfd_frame *cf) +static int snprintf_error_ctrl(char *buf, size_t len, const struct canfd_frame *cf) { int n = 0; @@ -542,7 +542,7 @@ static int snprintf_error_ctrl(char *buf, size_t len, struct canfd_frame *cf) return n; } -static int snprintf_error_prot(char *buf, size_t len, struct canfd_frame *cf) +static int snprintf_error_prot(char *buf, size_t len, const struct canfd_frame *cf) { int n = 0; @@ -563,8 +563,8 @@ static int snprintf_error_prot(char *buf, size_t len, struct canfd_frame *cf) return n; } -void snprintf_can_error_frame(char *buf, size_t len, struct canfd_frame *cf, - char* sep) +void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *cf, + const char* sep) { canid_t class, mask; int i, n = 0, classes = 0; diff --git a/lib.h b/lib.h index 4f73743..36c3a09 100644 --- a/lib.h +++ b/lib.h @@ -203,8 +203,8 @@ void sprint_long_canframe(char *buf , struct canfd_frame *cf, int view, int maxd * */ -void snprintf_can_error_frame(char *buf, size_t len, struct canfd_frame *cf, - char *sep); +void snprintf_can_error_frame(char *buf, size_t len, const struct canfd_frame *cf, + const char *sep); /* * Creates a CAN error frame output in user readable format. */