Commit a319ca8c90cbd4f20325a9b71d685a7cca36da9d
2021-10-15T10:36:12
move encode_delta() in pack_create.c to eliminate a forward declaration
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190
diff --git a/lib/pack_create.c b/lib/pack_create.c
index 125aaed..c2fe31d 100644
--- a/lib/pack_create.c
+++ b/lib/pack_create.c
@@ -165,7 +165,90 @@ delta_size(struct got_delta_instruction *deltas, int ndeltas)
static const struct got_error *
encode_delta(struct got_pack_meta *m, struct got_raw_object *o,
struct got_delta_instruction *deltas, int ndeltas,
- off_t base_size, FILE *f);
+ off_t base_size, FILE *f)
+{
+ unsigned char buf[16], *bp;
+ int i, j;
+ off_t n;
+ size_t w;
+ struct got_delta_instruction *d;
+
+ /* base object size */
+ buf[0] = base_size & GOT_DELTA_SIZE_VAL_MASK;
+ n = base_size >> GOT_DELTA_SIZE_SHIFT;
+ for (i = 1; n > 0; i++) {
+ buf[i - 1] |= GOT_DELTA_SIZE_MORE;
+ buf[i] = n & GOT_DELTA_SIZE_VAL_MASK;
+ n >>= GOT_DELTA_SIZE_SHIFT;
+ }
+ w = fwrite(buf, 1, i, f);
+ if (w != i)
+ return got_ferror(f, GOT_ERR_IO);
+
+ /* target object size */
+ buf[0] = o->size & GOT_DELTA_SIZE_VAL_MASK;
+ n = o->size >> GOT_DELTA_SIZE_SHIFT;
+ for (i = 1; n > 0; i++) {
+ buf[i - 1] |= GOT_DELTA_SIZE_MORE;
+ buf[i] = n & GOT_DELTA_SIZE_VAL_MASK;
+ n >>= GOT_DELTA_SIZE_SHIFT;
+ }
+ w = fwrite(buf, 1, i, f);
+ if (w != i)
+ return got_ferror(f, GOT_ERR_IO);
+
+ for (j = 0; j < ndeltas; j++) {
+ d = &deltas[j];
+ if (d->copy) {
+ n = d->offset;
+ bp = &buf[1];
+ buf[0] = GOT_DELTA_BASE_COPY;
+ for (i = 0; i < 4; i++) {
+ /* DELTA_COPY_OFF1 ... DELTA_COPY_OFF4 */
+ buf[0] |= 1 << i;
+ *bp++ = n & 0xff;
+ n >>= 8;
+ if (n == 0)
+ break;
+ }
+
+ n = d->len;
+ if (n != GOT_DELTA_COPY_DEFAULT_LEN) {
+ /* DELTA_COPY_LEN1 ... DELTA_COPY_LEN3 */
+ for (i = 0; i < 3 && n > 0; i++) {
+ buf[0] |= 1 << (i + 4);
+ *bp++ = n & 0xff;
+ n >>= 8;
+ }
+ }
+ w = fwrite(buf, 1, bp - buf, f);
+ if (w != bp - buf)
+ return got_ferror(f, GOT_ERR_IO);
+ } else {
+ char content[128];
+ size_t r;
+ if (fseeko(o->f, o->hdrlen + d->offset, SEEK_SET) == -1)
+ return got_error_from_errno("fseeko");
+ n = 0;
+ while (n != d->len) {
+ buf[0] = (d->len - n < 127) ? d->len - n : 127;
+ w = fwrite(buf, 1, 1, f);
+ if (w != 1)
+ return got_ferror(f, GOT_ERR_IO);
+ r = fread(content, 1, buf[0], o->f);
+ if (r != buf[0])
+ return got_ferror(o->f, GOT_ERR_IO);
+ w = fwrite(content, 1, buf[0], f);
+ if (w != buf[0])
+ return got_ferror(f, GOT_ERR_IO);
+ n += buf[0];
+ }
+ }
+ }
+
+ return NULL;
+}
+
static const struct got_error *
pick_deltas(struct got_pack_meta **meta, int nmeta, int nours,
@@ -1030,93 +1113,6 @@ packhdr(int *hdrlen, char *hdr, size_t bufsize, int obj_type, size_t len)
return NULL;
}
-static const struct got_error *
-encode_delta(struct got_pack_meta *m, struct got_raw_object *o,
- struct got_delta_instruction *deltas, int ndeltas,
- off_t base_size, FILE *f)
-{
- unsigned char buf[16], *bp;
- int i, j;
- off_t n;
- size_t w;
- struct got_delta_instruction *d;
-
- /* base object size */
- buf[0] = base_size & GOT_DELTA_SIZE_VAL_MASK;
- n = base_size >> GOT_DELTA_SIZE_SHIFT;
- for (i = 1; n > 0; i++) {
- buf[i - 1] |= GOT_DELTA_SIZE_MORE;
- buf[i] = n & GOT_DELTA_SIZE_VAL_MASK;
- n >>= GOT_DELTA_SIZE_SHIFT;
- }
- w = fwrite(buf, 1, i, f);
- if (w != i)
- return got_ferror(f, GOT_ERR_IO);
-
- /* target object size */
- buf[0] = o->size & GOT_DELTA_SIZE_VAL_MASK;
- n = o->size >> GOT_DELTA_SIZE_SHIFT;
- for (i = 1; n > 0; i++) {
- buf[i - 1] |= GOT_DELTA_SIZE_MORE;
- buf[i] = n & GOT_DELTA_SIZE_VAL_MASK;
- n >>= GOT_DELTA_SIZE_SHIFT;
- }
- w = fwrite(buf, 1, i, f);
- if (w != i)
- return got_ferror(f, GOT_ERR_IO);
-
- for (j = 0; j < ndeltas; j++) {
- d = &deltas[j];
- if (d->copy) {
- n = d->offset;
- bp = &buf[1];
- buf[0] = GOT_DELTA_BASE_COPY;
- for (i = 0; i < 4; i++) {
- /* DELTA_COPY_OFF1 ... DELTA_COPY_OFF4 */
- buf[0] |= 1 << i;
- *bp++ = n & 0xff;
- n >>= 8;
- if (n == 0)
- break;
- }
-
- n = d->len;
- if (n != GOT_DELTA_COPY_DEFAULT_LEN) {
- /* DELTA_COPY_LEN1 ... DELTA_COPY_LEN3 */
- for (i = 0; i < 3 && n > 0; i++) {
- buf[0] |= 1 << (i + 4);
- *bp++ = n & 0xff;
- n >>= 8;
- }
- }
- w = fwrite(buf, 1, bp - buf, f);
- if (w != bp - buf)
- return got_ferror(f, GOT_ERR_IO);
- } else {
- char content[128];
- size_t r;
- if (fseeko(o->f, o->hdrlen + d->offset, SEEK_SET) == -1)
- return got_error_from_errno("fseeko");
- n = 0;
- while (n != d->len) {
- buf[0] = (d->len - n < 127) ? d->len - n : 127;
- w = fwrite(buf, 1, 1, f);
- if (w != 1)
- return got_ferror(f, GOT_ERR_IO);
- r = fread(content, 1, buf[0], o->f);
- if (r != buf[0])
- return got_ferror(o->f, GOT_ERR_IO);
- w = fwrite(content, 1, buf[0], f);
- if (w != buf[0])
- return got_ferror(f, GOT_ERR_IO);
- n += buf[0];
- }
- }
- }
-
- return NULL;
-}
-
static int
packoff(char *hdr, off_t off)
{