diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-01-07 11:12:48 +0100 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2018-01-11 06:07:13 +0100 |
| commit | e85ecdd9254a8bd222ccb2dfed7d3b3bb96c8294 (patch) | |
| tree | 0483cdb3c5770ca75eeeb0cc2de787b0e7bdbd3c /core/file.c | |
| parent | 86ef9fce7517313570838ca8e853132876035611 (diff) | |
| download | subsurface-e85ecdd9254a8bd222ccb2dfed7d3b3bb96c8294.tar.gz | |
Introduce helper function empty_string()
There are ca. 50 constructs of the kind
same_string(s, "")
to test for empty or null strings. Replace them by the new helper
function empty_string().
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/file.c')
| -rw-r--r-- | core/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/file.c b/core/file.c index 55a7b73a3..237056bed 100644 --- a/core/file.c +++ b/core/file.c @@ -268,7 +268,7 @@ int check_git_sha(const char *filename, struct git_repository **git_p, const cha * get the SHA and compare with what we currently have */ if (git && git != dummy_git_repository) { const char *sha = get_sha(git, branch); - if (!same_string(sha, "") && + if (!empty_string(sha) && same_string(sha, current_sha)) { fprintf(stderr, "already have loaded SHA %s - don't load again\n", sha); free(current_sha); @@ -301,7 +301,7 @@ int parse_file(const char *filename) * get the SHA and compare with what we currently have */ if (git && git != dummy_git_repository) { const char *sha = get_sha(git, branch); - if (!same_string(sha, "") && + if (!empty_string(sha) && same_string(sha, current_sha) && !unsaved_changes()) { fprintf(stderr, "already have loaded SHA %s - don't load again\n", sha); |