From 43d8435cf84468e776e0a6a98d05ae7bd62583b7 Mon Sep 17 00:00:00 2001 From: Lewis Russell Date: Thu, 13 Jun 2024 22:20:06 +0100 Subject: revert: "refactor: use S_LEN macro" (#29319) revert: "refactor: use S_LEN(s) instead of s, n (#29219)" This reverts commit c37695a5d5f2e8914fff86f3581bed70b4c85d3c. --- src/nvim/runtime.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/nvim/runtime.c') diff --git a/src/nvim/runtime.c b/src/nvim/runtime.c index 6728262432..c479418131 100644 --- a/src/nvim/runtime.c +++ b/src/nvim/runtime.c @@ -1321,16 +1321,16 @@ expand: } if (flags & DIP_START) { - memcpy(tail - 15, S_LEN("pack/*/start/*/")); // NOLINT + memcpy(tail - 15, "pack/*/start/*/", 15); // NOLINT globpath(p_pp, tail - 15, gap, glob_flags, expand_dirs); - memcpy(tail - 8, S_LEN("start/*/")); // NOLINT + memcpy(tail - 8, "start/*/", 8); // NOLINT globpath(p_pp, tail - 8, gap, glob_flags, expand_dirs); } if (flags & DIP_OPT) { - memcpy(tail - 13, S_LEN("pack/*/opt/*/")); // NOLINT + memcpy(tail - 13, "pack/*/opt/*/", 13); // NOLINT globpath(p_pp, tail - 13, gap, glob_flags, expand_dirs); - memcpy(tail - 6, S_LEN("opt/*/")); // NOLINT + memcpy(tail - 6, "opt/*/", 6); // NOLINT globpath(p_pp, tail - 6, gap, glob_flags, expand_dirs); } @@ -1877,7 +1877,7 @@ static bool concat_continued_line(garray_T *const ga, const int init_growsize, c const char *const line = skipwhite_len(p, len); len -= (size_t)(line - p); // Skip lines starting with '\" ', concat lines starting with '\' - if (len >= 3 && strncmp(line, S_LEN("\"\\ ")) == 0) { + if (len >= 3 && strncmp(line, "\"\\ ", 3) == 0) { return true; } else if (len == 0 || line[0] != '\\') { return false; -- cgit