On Thu, 3 Jan 2008, Arnaldo Carvalho de Melo wrote: > Em Thu, Jan 03, 2008 at 06:45:32PM +0200, Ilpo Järvinen escreveu: > > On Thu, 3 Jan 2008, Arnaldo Carvalho de Melo wrote: > > > > Now that I automated it for inlines per file, one thing that annoys me a > > bit is that it does not keep identical formatting on the last line (it's > > fixable of course by some simple sed trickery): > > > > static inline int tcp_may_raise_cwnd(const struct sock *sk, const int > > flag) > > net/ipv4/tcp_input.c: > > tcp_prune_queue | -16 > > 1 function changed, 16 bytes removed > > > > ...versus... > > > > static inline int tcp_may_update_window(const struct tcp_sock *tp, > > net/ipv4/tcp_input.c: > > tcp_disordered_ack | -18 > > tcp_ack | -76 > > 2 functions changed, 94 bytes removed > > > > net/ipv4/tcp_input.c: > > tcp_may_update_window | +56 > > 1 function changed, 56 bytes added > > > > net/ipv4/tcp_input.o: > > 3 functions changed, 56 bytes added, 94 bytes removed, diff: -38 > > > > > > diff: xx is not always present. > > Fixed, please do a git-pull. ...much better with piped sort now (only added lines seemed to show up still without diff and they're not that interesting after all :-)), but I think this is needed as well to complete the change... -- i. -- [PATCH] [CODIFF]: Be even more consistent on the summary lines Forgotten change similar to the previous patch. Signed-off-by: Ilpo Järvinen --- codiff.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/codiff.c b/codiff.c index 0eada19..3e59e95 100644 --- a/codiff.c +++ b/codiff.c @@ -568,27 +568,20 @@ static int cu_show_diffs_iterator(struct cu *cu, void *cookie) static void print_total_function_diff(const char *filename) { - int kind = 0; - printf("\n%s:\n", filename); printf(" %u function%s changed", total_nr_functions_changed, total_nr_functions_changed > 1 ? "s" : ""); - if (total_function_bytes_added != 0) { - ++kind; + if (total_function_bytes_added != 0) printf(", %u bytes added", total_function_bytes_added); - } - if (total_function_bytes_removed != 0) { - ++kind; + if (total_function_bytes_removed != 0) printf(", %u bytes removed", total_function_bytes_removed); - } - if (kind == 2) - printf(", diff: %+d", - (total_function_bytes_added - - total_function_bytes_removed)); + printf(", diff: %+d", + (total_function_bytes_added - + total_function_bytes_removed)); putchar('\n'); } -- 1.5.0.6