summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--commit-tree.c2
-rw-r--r--diff-tree.c2
-rw-r--r--init-db.c2
-rw-r--r--read-cache.c2
-rw-r--r--show-diff.c6
-rw-r--r--show-files.c2
-rw-r--r--update-cache.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/commit-tree.c b/commit-tree.c
index ef1f068..ac431fe 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -41,7 +41,7 @@ static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
alloc = (size + 32767) & ~32767;
buf = *bufp;
if (newsize > alloc) {
- alloc = (newsize + 32767) & ~32767;
+ alloc = (newsize + 32767) & ~32767;
buf = realloc(buf, alloc);
*bufp = buf;
}
diff --git a/diff-tree.c b/diff-tree.c
index 04eb933..2709f06 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -103,7 +103,7 @@ static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
/*
* If the filemode has changed to/from a directory from/to a regular
- * file, we need to consider it a remove and an add.
+ * file, we need to consider it a remove and an add.
*/
if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
show_file("-", tree1, size1, base);
diff --git a/init-db.c b/init-db.c
index 503e719..ff2b11a 100644
--- a/init-db.c
+++ b/init-db.c
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
}
/*
- * The default case is to have a DB per managed directory.
+ * The default case is to have a DB per managed directory.
*/
sha1_dir = DEFAULT_DB_ENVIRONMENT;
fprintf(stderr, "defaulting to private storage area\n");
diff --git a/read-cache.c b/read-cache.c
index d8b383f..e3d3ddb 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -136,7 +136,7 @@ void *map_sha1_file(const unsigned char *sha1, unsigned long *size)
return NULL;
}
if (fstat(fd, &st) < 0) {
- close(fd);
+ close(fd);
return NULL;
}
map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
diff --git a/show-diff.c b/show-diff.c
index 21c9045..1286dd1 100644
--- a/show-diff.c
+++ b/show-diff.c
@@ -5,7 +5,7 @@
*/
#include "cache.h"
-static void show_differences(char *name,
+static void show_differences(char *name,
void *old_contents, unsigned long long old_size)
{
static char cmd[1000];
@@ -33,7 +33,7 @@ static void show_diff_empty(struct cache_entry *ce)
printf("--- %s\n", ce->name);
printf("+++ /dev/null\n");
p = old;
- end = old + size;
+ end = old + size;
while (p < end)
if (*p++ == '\n')
lines ++;
@@ -44,7 +44,7 @@ static void show_diff_empty(struct cache_entry *ce)
if (startline) {
putchar('-');
startline = 0;
- }
+ }
putchar(c);
if (c == '\n')
startline = 1;
diff --git a/show-files.c b/show-files.c
index 9f62e97..7d3797f 100644
--- a/show-files.c
+++ b/show-files.c
@@ -41,7 +41,7 @@ static void add_name(const char *pathname, int len)
* handle them at all yet. Maybe that will change some day.
*
* Also, we currently ignore all names starting with a dot.
- * That likely will not change.
+ * That likely will not change.
*/
static void read_directory(const char *path, const char *base, int baselen)
{
diff --git a/update-cache.c b/update-cache.c
index 8fcf07a..1f87892 100644
--- a/update-cache.c
+++ b/update-cache.c
@@ -213,7 +213,7 @@ static void refresh_cache(void)
* are hidden, for chist sake.
*
* Also, we don't want double slashes or slashes at the
- * end that can make pathnames ambiguous.
+ * end that can make pathnames ambiguous.
*/
static int verify_path(char *path)
{