From 86feabf49c078062faf0c07c02e18ecef8e30771 Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Tue, 2 Aug 2016 14:49:54 -0300 Subject: [PATCH] sch2fig/git-file.c, git-file.h: start our git_* identifiers with vcs_git_ Since we'll use this name space more intensely, we don't want to risk clashes --- eeshow/file.c | 2 +- eeshow/git-file.c | 4 ++-- eeshow/git-file.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eeshow/file.c b/eeshow/file.c index 1145173..5635a0a 100644 --- a/eeshow/file.c +++ b/eeshow/file.c @@ -71,6 +71,6 @@ void file_read(const char *name, bool (*parse)(void *user, const char *line), tmp = stralloc(name); tmp[colon - name] = 0; - git_read(tmp, colon + 1, parse, user); + vcs_git_read(tmp, colon + 1, parse, user); free(tmp); } diff --git a/eeshow/git-file.c b/eeshow/git-file.c index 098f136..bd66d73 100644 --- a/eeshow/git-file.c +++ b/eeshow/git-file.c @@ -1,5 +1,5 @@ /* - * git-file.c - Open and read a file from git + * git-file.c - Open and read a file from git version control system * * Written 2016 by Werner Almesberger * Copyright 2016 by Werner Almesberger @@ -338,7 +338,7 @@ static void send_data(const char *data, unsigned size, } -void git_read(const char *revision, const char *name, +void vcs_git_read(const char *revision, const char *name, bool (*parse)(void *user, const char *line), void *user) { static bool initialized = 0; diff --git a/eeshow/git-file.h b/eeshow/git-file.h index 4642528..503a563 100644 --- a/eeshow/git-file.h +++ b/eeshow/git-file.h @@ -1,5 +1,5 @@ /* - * git-file.h - Open and read a file from git + * git-file.h - Open and read a file from git version control system * * Written 2016 by Werner Almesberger * Copyright 2016 by Werner Almesberger @@ -16,7 +16,7 @@ #include -void git_read(const char *revision, const char *name, +void vcs_git_read(const char *revision, const char *name, bool (*parse)(void *user, const char *line), void *user); #endif /* !GIT_FILE_H */