laumann/ani - Change 7NQTS36DJ6GRXMZDNMORKPWF7VBESQY4DH2XFI7VI2A2JVMFIK5AC

bincode: change signature of getstr to receive str destination

The bincode component should not be in charge of allocating any memory, and the only function doing so was bincode_getstr(). It is essentially like bincode_getbytes() but for the signedness of the type and the placement of the terminating zero byte at the end of the string.

Changing _getstr() to require a destination buffer allows removing an import of stdlib.h as well.

Created by laumann on October 4, 2023

7NQTS36DJ6GRXMZDNMORKPWF7VBESQY4DH2XFI7VI2A2JVMFIK5AC

Dependencies

In channels

main

Change contents

Replacement in change.c at line 273 [5.1047]

B:BD[4.2731] → [4.2731:2771]

	local->path = bincode_getstr(bc, len);

[4.2731]

[4.2771]

	local->path = xmalloc(len + 1);
	bincode_getstr(bc, local->path, len);

Replacement in change.c at line 284 [5.1047]

B:BD[4.2931] → [4.2931:2970]

		*encoding = bincode_getstr(bc, len);

[4.2931]

[6.3751]

		*encoding = xmalloc(len + 1);
		bincode_getstr(bc, *encoding, len);

Replacement in change.c at line 326 [5.1047]

B:BD[4.3683] → [4.3683:3734]

			bhunk->fileadd.path = bincode_getstr(bc, slen);

[4.3683]

[4.3734]

			bhunk->fileadd.path = xmalloc(slen + 1);
			bincode_getstr(bc, bhunk->fileadd.path, slen);

Replacement in change.c at line 334 [5.1047]

B:BD[4.3920] → [4.3920:3972]

			bhunk->filemove.path = bincode_getstr(bc, slen);

[4.3920]

[7.0]

			bhunk->filemove.path = xmalloc(slen + 1);
			bincode_getstr(bc, bhunk->filemove.path, slen);

Replacement in change.c at line 343 [5.1047]

B:BD[4.4134] → [4.4134:4185]

			bhunk->filedel.path = bincode_getstr(bc, slen);

[4.4134]

[4.4185]

			bhunk->filedel.path = xmalloc(slen + 1);
			bincode_getstr(bc, bhunk->filedel.path, slen);

Replacement in change.c at line 354 [5.1047]

B:BD[4.4389] → [4.4389:4442]

			bhunk->fileundel.path = bincode_getstr(bc, slen);

[4.4389]

[4.4442]

			bhunk->fileundel.path = xmalloc(slen + 1);
			bincode_getstr(bc, bhunk->fileundel.path, slen);

Replacement in change.c at line 377 [5.1047]

∅:D[4.4765] → [8.374:409]

B:BD[8.374] → [8.374:409]

B:BD[8.409] → [4.4766:4796]

			bhunk->solvenameconflict.path =
				bincode_getstr(bc, slen);

[4.4765]

[8.444]

			bhunk->solvenameconflict.path = xmalloc(slen + 1);
			bincode_getstr(bc, bhunk->solvenameconflict.path, slen);

Replacement in change.c at line 383 [5.1047]

∅:D[4.4888] → [8.589:626]

B:BD[8.589] → [8.589:626]

B:BD[8.626] → [4.4889:4919]

			bhunk->unsolvenameconflict.path =
				bincode_getstr(bc, slen);

[4.4888]

[9.306]

			bhunk->unsolvenameconflict.path = xmalloc(slen + 1);
			bincode_getstr(
				bc, bhunk->unsolvenameconflict.path, slen
			);

Replacement in change.c at line 455 [5.1047]

B:BD[4.5414] → [4.5414:5466]

	hashed->header.message = bincode_getstr(&bc, len);

[4.5414]

[10.853]

	hashed->header.message = xmalloc(len + 1);
	bincode_getstr(&bc, hashed->header.message, len);

Replacement in change.c at line 466 [5.1047]

B:BD[4.5523] → [4.5523:5580]

		hashed->header.description = bincode_getstr(&bc, len);

[4.5523]

[11.259]

		hashed->header.description = xmalloc(len + 1);
		bincode_getstr(&bc, hashed->header.description, len);

Replacement in change.c at line 475 [5.1047]

B:BD[12.1248] → [4.5610:5664]

	hashed->header.timestamp = bincode_getstr(&bc, len);

[12.1248]

[13.354]

	hashed->header.timestamp = xmalloc(len + 1);
	bincode_getstr(&bc, hashed->header.timestamp, len);

Replacement in change.c at line 495 [5.1047]

B:BD[11.677] → [4.5779:5809]

				bincode_getstr(&bc, len);

[11.677]

[4.5809]

				xmalloc(len + 1);
			bincode_getstr(
				&bc,
				hashed->header.authors.map[i].entries[j].key,
				len
			);

Replacement in change.c at line 503 [5.1047]

B:BD[11.730] → [4.5840:5870]

				bincode_getstr(&bc, len);

[11.730]

[13.1172]

				xmalloc(len + 1);
			bincode_getstr(
				&bc,
				hashed->header.authors.map[i].entries[j].value,
				len
			);

Replacement in change.c at line 747 [5.1047]

B:BD[14.834] → [14.834:875]

	m->basename = bincode_getstr(&bc, len);

[14.834]

[3.5076]

	m->basename = xmalloc(len + 1);
	bincode_getstr(&bc, m->basename, len);

Replacement in bincode.h at line 37 [10.1676]

B:BD[10.2269] → [10.2269:2498]

 * Allocate and return a string of the given length.
 *
 * The memory allocated shall be the given length plus one, to hold the
 * terminating zero.
 *
 * Returns the allocated string. The caller is responsible for deallocating.

[10.2269]

[10.2498]

 * Fill in a string of the given length, the destination should have
 * sufficient space.

Replacement in bincode.h at line 40 [10.1676]

B:BD[10.2502] → [15.4766:4814]

char *bincode_getstr(struct bincode *, size_t);

[10.2502]

[15.4814]

void bincode_getstr(struct bincode *, char *, size_t);

Deletion in bincode.c at line 3 [10.2731]
B:BD[10.2772] → [10.2772:2792]
```
#include <stdlib.h>
```
Replacement in bincode.c at line 67 [10.2731]
B:BD[10.3322] → [10.3322:3329]
B:BD[10.3329] → [15.5014:5060]
```
char *
bincode_getstr(struct bincode *s, size_t len)
```
[10.3322]
[10.3368]
```
void
bincode_getstr(struct bincode *s, char *str, size_t len)
```
Replacement in bincode.c at line 70 [10.2731]
B:BD[10.3370] → [10.3370:3382]
B:BD[10.3382] → [16.1566:1579]
∅:D[16.1579] → [10.3382:3383]
B:BD[10.3382] → [10.3382:3383]
B:BD[10.3383] → [16.1580:1593]
∅:D[16.1593] → [10.3383:3408]
B:BD[10.3383] → [10.3383:3408]
B:BD[10.3408] → [16.1594:1616]
∅:D[17.959] → [10.3430:3448]
∅:D[16.1616] → [10.3430:3448]
B:BD[10.3430] → [10.3430:3448]
B:BD[10.3448] → [2.119:120]
```
	char *str;
	uint8_t *b;
	b = s->buf;
	str = xmalloc(len + 1);
	memcpy(str, b, len);
	str[len] = '\0';
```
[10.3370]
[2.120]
```
	memcpy(str, s->buf, len);
```
Replacement in bincode.c at line 73 [10.2731]
B:BD[10.3449] → [10.3449:3462]
```
	return str;
```
[16.1635]
[18.364]
```
	str[len] = '\0';
```