> Printing on stdout, and calls to warning() or error() are not > taken care of in this patch, as that will be done in following > patches. > - if (state->apply_verbosely) > + if (state->apply_verbosity > verbosity_normal) > error(_("while searching for:\n%.*s"), > (int)(old - oldlines), oldlines); But this is an error(..) ? Have you considered to replace all these print functions (error, warning, fprintf, printf, fprintf_ln) with another custom int say_when_at_least(verbosity level, const char *fmt,...) ? (I guess that would be more invasive, but the result would be more consistent.)