diff options
| -rw-r--r-- | core/android.cpp | 3 | ||||
| -rw-r--r-- | core/dive.h | 6 | ||||
| -rw-r--r-- | core/ios.cpp | 5 | ||||
| -rw-r--r-- | core/macos.c | 6 | ||||
| -rw-r--r-- | core/save-git.c | 21 | ||||
| -rw-r--r-- | core/unix.c | 30 | ||||
| -rw-r--r-- | core/windows.c | 3 |
7 files changed, 8 insertions, 66 deletions
diff --git a/core/android.cpp b/core/android.cpp index b86f2e557..d1a1570fb 100644 --- a/core/android.cpp +++ b/core/android.cpp @@ -53,9 +53,6 @@ bool subsurface_ignore_font(const char *font) return false; } -void subsurface_user_info(struct user_info *user) -{ /* Encourage use of at least libgit2-0.20 */ } - static const char *system_default_path_append(const char *append) { // Qt appears to find a working path for us - let's just go with that diff --git a/core/dive.h b/core/dive.h index 1e5ca873d..acd0c7e72 100644 --- a/core/dive.h +++ b/core/dive.h @@ -322,12 +322,6 @@ extern int save_dive_sites_logic(const char *filename, const struct dive_site *s struct membuffer; extern void save_one_dive_to_mb(struct membuffer *b, struct dive *dive, bool anonymize); -struct user_info { - char *name; - char *email; -}; - -extern void subsurface_user_info(struct user_info *); extern void subsurface_console_init(void); extern void subsurface_console_exit(void); extern bool subsurface_user_is_root(void); diff --git a/core/ios.cpp b/core/ios.cpp index d54f2b4b8..b8fe7227e 100644 --- a/core/ios.cpp +++ b/core/ios.cpp @@ -37,11 +37,6 @@ bool subsurface_ignore_font(const char*) return false; } -void subsurface_user_info(struct user_info *) -{ - // We use of at least libgit2-0.20 -} - static const char *system_default_path_append(const char *append) { // Qt appears to find a working path for us - let's just go with that diff --git a/core/macos.c b/core/macos.c index dc07dc7b6..0ee7c1952 100644 --- a/core/macos.c +++ b/core/macos.c @@ -20,12 +20,6 @@ #include <zip.h> #include <sys/stat.h> -void subsurface_user_info(struct user_info *info) -{ - UNUSED(info); - /* Nothing, let's use libgit2-20 on MacOS */ -} - /* macos defines CFSTR to create a CFString object from a constant, * but no similar macros if a C string variable is supposed to be * the argument. We add this here (hardcoding the default allocator diff --git a/core/save-git.c b/core/save-git.c index 7bf7b2e1d..e3564eea7 100644 --- a/core/save-git.c +++ b/core/save-git.c @@ -1024,19 +1024,14 @@ static int get_authorship(git_repository *repo, git_signature **authorp) { if (git_signature_default(authorp, repo) == 0) return 0; - /* try to fetch the user info from the OS, otherwise use default values. */ - struct user_info user = { .name = NULL, .email = NULL }; - subsurface_user_info(&user); - if (!user.name || !*user.name) - user.name = strdup("Subsurface"); - if (!user.email) - user.email = strdup("subsurface-app-account@subsurface-divelog.org"); - - /* git_signature_default() is too recent */ - int ret = git_signature_now(authorp, user.name, user.email); - free((void *)user.name); - free((void *)user.email); - return ret; + +#ifdef SUBSURFACE_MOBILE +#define APPNAME "Subsurface-mobile" +#else +#define APPNAME "Subsurface" +#endif + return git_signature_now(authorp, APPNAME, "subsurface-app-account@subsurface-divelog.org"); +#undef APPNAME } static void create_commit_message(struct membuffer *msg, bool create_empty) diff --git a/core/unix.c b/core/unix.c index 5106278a2..bcac33ff3 100644 --- a/core/unix.c +++ b/core/unix.c @@ -34,36 +34,6 @@ bool subsurface_ignore_font(const char *font) return false; } -void subsurface_user_info(struct user_info *user) -{ - struct passwd *pwd = getpwuid(getuid()); - const char *username = getenv("USER"); - - if (pwd) { - if (!empty_string(pwd->pw_gecos)) { - user->name = strdup(pwd->pw_gecos); - // We only want the name, not the office or phone number - char *c = user->name; - while (*c) { - if (*c == ',') { - *c = '\0'; - break; - } - ++c; - } - } - if (!username) - username = pwd->pw_name; - } - if (!empty_string(username)) { - char hostname[64]; - struct membuffer mb = {}; - gethostname(hostname, sizeof(hostname)); - put_format(&mb, "%s@%s", username, hostname); - user->email = detach_cstring(&mb); - } -} - static const char *system_default_path_append(const char *append) { const char *home = getenv("HOME"); diff --git a/core/windows.c b/core/windows.c index 4ca0c621a..37f4d3a63 100644 --- a/core/windows.c +++ b/core/windows.c @@ -23,9 +23,6 @@ const char current_system_divelist_default_font[] = "Segoe UI"; const char *system_divelist_default_font = non_standard_system_divelist_default_font; double system_divelist_default_font_size = -1; -void subsurface_user_info(struct user_info *user) -{ /* Encourage use of at least libgit2-0.20 */ } - extern bool isWin7Or8(); void subsurface_OS_pref_setup(void) |