summaryrefslogtreecommitdiff
path: root/src/delta-apply.c
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2011-09-19 03:34:49 +0300
committerVicent Marti <tanoku@gmail.com>2011-09-19 03:34:49 +0300
commit87d9869fc30951cec632e0d6a3d1dd47756d2886 (patch)
treead39ac1e487e2d5baa64d7fa979122541f6b8bcb /src/delta-apply.c
parentbb742ede3d54564ff900fb7246e7b1ff01482b2c (diff)
downloadlibgit2-87d9869fc30951cec632e0d6a3d1dd47756d2886.tar.gz
Tabify everything
There were quite a few places were spaces were being used instead of tabs. Try to catch them all. This should hopefully not break anything. Except for `git blame`. Oh well.
Diffstat (limited to 'src/delta-apply.c')
-rw-r--r--src/delta-apply.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/delta-apply.c b/src/delta-apply.c
index 70ddfd9bc..e1fb15b9b 100644
--- a/src/delta-apply.c
+++ b/src/delta-apply.c
@@ -11,7 +11,7 @@
/*
* This file was heavily cribbed from BinaryDelta.java in JGit, which
* itself was heavily cribbed from <code>patch-delta.c</code> in the
- * GIT project. The original delta patching code was written by
+ * GIT project. The original delta patching code was written by
* Nicolas Pitre <nico@cam.org>.
*/
@@ -70,15 +70,15 @@ int git__delta_apply(
*/
size_t off = 0, len = 0;
- if (cmd & 0x01) off = *delta++;
- if (cmd & 0x02) off |= *delta++ << 8;
+ if (cmd & 0x01) off = *delta++;
+ if (cmd & 0x02) off |= *delta++ << 8;
if (cmd & 0x04) off |= *delta++ << 16;
if (cmd & 0x08) off |= *delta++ << 24;
- if (cmd & 0x10) len = *delta++;
- if (cmd & 0x20) len |= *delta++ << 8;
+ if (cmd & 0x10) len = *delta++;
+ if (cmd & 0x20) len |= *delta++ << 8;
if (cmd & 0x40) len |= *delta++ << 16;
- if (!len) len = 0x10000;
+ if (!len) len = 0x10000;
if (base_len < off + len || res_sz < len)
goto fail;
@@ -93,7 +93,7 @@ int git__delta_apply(
if (delta_end - delta < cmd || res_sz < cmd)
goto fail;
memcpy(res_dp, delta, cmd);
- delta += cmd;
+ delta += cmd;
res_dp += cmd;
res_sz -= cmd;