summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 42d545e)
raw | patch | inline | side by side (parent: 42d545e)
author | Ingo Molnar <mingo@elte.hu> | |
Tue, 12 Apr 2005 18:36:26 +0000 (11:36 -0700) | ||
committer | Petr Baudis <xpasky@machine> | |
Wed, 13 Apr 2005 09:35:04 +0000 (02:35 -0700) |
Trivial whitespace fixes.
From: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
From: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
commit-tree.c | patch | blob | history | |
diff-tree.c | patch | blob | history | |
init-db.c | patch | blob | history | |
read-cache.c | patch | blob | history | |
show-diff.c | patch | blob | history | |
show-files.c | patch | blob | history | |
update-cache.c | patch | blob | history |
diff --git a/commit-tree.c b/commit-tree.c
index ef1f068510e5851ab2f1219eae244ef861cefa13..ac431febe9052109d52bfa556ee04b2ef7715f01 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
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 04eb933b00b94411f212f5ce2cb54510ce8e360e..2709f06ba044b2541db0d12ae0366a0ad976251c 100644 (file)
--- 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 503e7193f34afd538568a8129a4d488eef9e33a2..ff2b11a3b33ecba970f59bef3ba63dcc29b53855 100644 (file)
--- a/init-db.c
+++ b/init-db.c
}
/*
- * 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 d8b383fe6b0544e65e9633f747346f8042f2840a..e3d3ddb18ce03c0cbd29242e779ae603653c5913 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
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 21c90453eb1320d4b5f6dd89d03b378e3ba54758..1286dd1217582df17df629413f781010bc41f314 100644 (file)
--- a/show-diff.c
+++ b/show-diff.c
*/
#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];
printf("--- %s\n", ce->name);
printf("+++ /dev/null\n");
p = old;
- end = old + size;
+ end = old + size;
while (p < end)
if (*p++ == '\n')
lines ++;
if (startline) {
putchar('-');
startline = 0;
- }
+ }
putchar(c);
if (c == '\n')
startline = 1;
diff --git a/show-files.c b/show-files.c
index 9f62e9700164e07bbbfdb7af7d1d3ba8f74ef7c7..7d3797f27e7d022d4504e6847b0deea22bac8063 100644 (file)
--- a/show-files.c
+++ b/show-files.c
* 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 8fcf07a6118104876770042dfd1b429c36f8c57e..1f87892e3451f335530054145bdf435e64c0be97 100644 (file)
--- a/update-cache.c
+++ b/update-cache.c
* 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)
{