advice: extract vadvise() from advise()
In preparation for a new advice method, extract a version of advise() that uses an explict 'va_list' parameter. Call it from advise() for a functionally equivalent version. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Heba Waly <heba.waly@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Heba Waly committed
Mar 2, 2020 at 20:01 UTC
06ac2b3b6e30e65f4f9bc63ca78a1e33025f2e4c
1 file changed
+9
-4
advice.c
+9
-4
@@ -96,15 +96,12 @@ static struct {
96
{ "pushNonFastForward", &advice_push_update_rejected }
97
};
98
99
-void advise(const char *advice, ...)
99
+static void vadvise(const char *advice, va_list params)
100
{
101
struct strbuf buf = STRBUF_INIT;
102
- va_list params;
102
const char *cp, *np;
103
105
- va_start(params, advice);
104
strbuf_vaddf(&buf, advice, params);
107
- va_end(params);
105
106
for (cp = buf.buf; *cp; cp = np) {
107
np = strchrnul(cp, '\n');
@@ -118,6 +115,14 @@ void advise(const char *advice, ...)
115
strbuf_release(&buf);
116
}
117
118
+void advise(const char *advice, ...)
119
+{
120
+ va_list params;
121
+ va_start(params, advice);
122
+ vadvise(advice, params);
123
+ va_end(params);
124
+}
125
+
126
int git_default_advice_config(const char *var, const char *value)
127
{
128
const char *k, *slot_name;