Browse Source

Cleanup

master
cancel 5 years ago
parent
commit
c8652c1bdc
  1. 3
      thirdparty/sdd.c
  2. 1
      thirdparty/sdd.h
  3. 6
      tui_main.c

3
thirdparty/sdd.c

@ -112,6 +112,9 @@ sdd *sdd_cpylen(sdd *restrict s, char const *restrict cstr, size_t len) {
((char *)s)[len] = '\0'; ((char *)s)[len] = '\0';
return s; return s;
} }
sdd *sdd_cpysdd(sdd *restrict s, sdd const *restrict other) {
return sdd_cpylen(s, (char const *)other, SDD_HDR(other)->len);
}
SDD_NOINLINE SDD_NOINLINE
sdd *sdd_ensurecap(sdd *s, size_t new_cap) { sdd *sdd_ensurecap(sdd *s, size_t new_cap) {
sdd_header *hdr = SDD_HDR(s); sdd_header *hdr = SDD_HDR(s);

1
thirdparty/sdd.h

@ -57,6 +57,7 @@ sdd *sdd_cpy(sdd *restrict s, char const *restrict cstr) SDD_NONNULL() SDD_USED;
// ^- Set `s` to contain the contents of `cstr` // ^- Set `s` to contain the contents of `cstr`
sdd *sdd_cpylen(sdd *restrict s, char const *restrict cstr, size_t len) sdd *sdd_cpylen(sdd *restrict s, char const *restrict cstr, size_t len)
SDD_NONNULL() SDD_USED; SDD_NONNULL() SDD_USED;
sdd *sdd_cpysdd(sdd *restrict s, sdd const *restrict other);
size_t sdd_len(sdd const *s) SDD_NONNULL(); size_t sdd_len(sdd const *s) SDD_NONNULL();
// ^- Bytes used by string (excl. null term) // ^- Bytes used by string (excl. null term)

6
tui_main.c

@ -3031,8 +3031,7 @@ int main(int argc, char** argv) {
field_load_file(sddc(temp_name), &ged_state.field); field_load_file(sddc(temp_name), &ged_state.field);
if (fle == Field_load_error_ok) { if (fle == Field_load_error_ok) {
qnav_stack_pop(); qnav_stack_pop();
file_name = sdd_cpylen(file_name, sddc(temp_name), file_name = sdd_cpysdd(file_name, temp_name);
sdd_len(temp_name));
ged_state.filename = sddc(file_name); ged_state.filename = sddc(file_name);
mbuf_reusable_ensure_size(&ged_state.mbuf_r, mbuf_reusable_ensure_size(&ged_state.mbuf_r,
ged_state.field.height, ged_state.field.height,
@ -3062,8 +3061,7 @@ int main(int argc, char** argv) {
qnav_stack_pop(); qnav_stack_pop();
bool saved_ok = try_save_with_msg(&ged_state.field, temp_name); bool saved_ok = try_save_with_msg(&ged_state.field, temp_name);
if (saved_ok) { if (saved_ok) {
file_name = sdd_cpylen(file_name, sddc(temp_name), file_name = sdd_cpysdd(file_name, temp_name);
sdd_len(temp_name));
ged_state.filename = sddc(file_name); ged_state.filename = sddc(file_name);
} }
} }

Loading…
Cancel
Save