Skip to content

P
PPSi
Commit 4a512fd8 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

diag: timed_printf() needs a ppi argument 

This is needed for the next commit, where time operations become local
to the specific pp instance.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 82de2e3a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
diag/diag-yes.c
View file @ 4a512fd8
...@@ -12,17 +12,17 @@ void pp_diag_fsm(struct pp_instance *ppi, char *name, int sequence, int plen) ...@@ -12,17 +12,17 @@ void pp_diag_fsm(struct pp_instance *ppi, char *name, int sequence, int plen)
{ {
if (sequence == STATE_ENTER) { if (sequence == STATE_ENTER) {
/* enter with or without a packet len */ /* enter with or without a packet len */
pp_timed_printf("fsm: ENTER %s, packet len %i\n", pp_timed_printf(ppi, "fsm: ENTER %s, packet len %i\n",
name, plen); name, plen);
return; return;
} }
if (sequence == STATE_LOOP) { if (sequence == STATE_LOOP) {
pp_timed_printf("fsm: %s: reenter in %i ms\n", name, pp_timed_printf(ppi, "fsm: %s: reenter in %i ms\n", name,
ppi->next_delay); ppi->next_delay);
return; return;
} }
/* leave has one \n more, so different states are separate */ /* leave has one \n more, so different states are separate */
pp_timed_printf("fsm: LEAVE %s (next: %3i in %i ms)\n\n", pp_timed_printf(ppi, "fsm: LEAVE %s (next: %3i in %i ms)\n\n",
name, ppi->next_state, ppi->next_delay); name, ppi->next_state, ppi->next_delay);
} }
...@@ -58,7 +58,7 @@ void pp_diag_printf(struct pp_instance *ppi, char *fmt, ...) ...@@ -58,7 +58,7 @@ void pp_diag_printf(struct pp_instance *ppi, char *fmt, ...)
va_end(args); va_end(args);
} }
void pp_timed_printf(char *fmt, ...) void pp_timed_printf(struct pp_instance *ppi, char *fmt, ...)
{ {
va_list args; va_list args;
TimeInternal t; TimeInternal t;
......
include/ppsi/diag.h
View file @ 4a512fd8
...@@ -25,7 +25,7 @@ extern void pp_diag_error(struct pp_instance *ppi, int err); ...@@ -25,7 +25,7 @@ extern void pp_diag_error(struct pp_instance *ppi, int err);
extern void pp_diag_error_str2(struct pp_instance *ppi, char *s1, char *s2); extern void pp_diag_error_str2(struct pp_instance *ppi, char *s1, char *s2);
extern void pp_diag_fatal(struct pp_instance *ppi, char *s1, char *s2); extern void pp_diag_fatal(struct pp_instance *ppi, char *s1, char *s2);
extern void pp_diag_printf(struct pp_instance *ppi, char *fmt, ...); extern void pp_diag_printf(struct pp_instance *ppi, char *fmt, ...);
extern void pp_timed_printf(char *fmt, ...); extern void pp_timed_printf(struct pp_instance *ppi, char *fmt, ...);
/* Our printf, that is implemented internally */ /* Our printf, that is implemented internally */
extern int pp_printf(const char *fmt, ...) extern int pp_printf(const char *fmt, ...)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment