Skip to content

Commit b6af51d

Browse files
alandekokalandekok
committed
the sbuff escape / unescape rules should be const
1 parent 8cabbf0 commit b6af51d

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

‎src/lib/unlang/edit.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@ static int expanded_lhs_value(request_t *request, unlang_frame_state_edit_t *sta
12951295
fr_type_t type;
12961296
fr_value_box_t *box = fr_value_box_list_head(&current->lhs.list);
12971297
fr_value_box_t *dst;
1298-
fr_sbuff_unescape_rules_t *erules = NULL;
1298+
fr_sbuff_unescape_rules_t const *erules = NULL;
12991299

13001300
fr_assert(current->parent);
13011301

‎src/lib/util/value.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ static int64_t const fr_value_box_integer_min[] = {
269269
[FR_TYPE_MAX] = 0 //!< Ensure array covers all types.
270270
};
271271

272-
fr_sbuff_unescape_rules_t fr_value_unescape_double = {
272+
fr_sbuff_unescape_rules_t const fr_value_unescape_double = {
273273
.name = "double",
274274
.chr = '\\',
275275
.subs = {
@@ -288,7 +288,7 @@ fr_sbuff_unescape_rules_t fr_value_unescape_double = {
288288
.do_oct = true
289289
};
290290

291-
fr_sbuff_unescape_rules_t fr_value_unescape_single = {
291+
fr_sbuff_unescape_rules_t const fr_value_unescape_single = {
292292
.name = "single",
293293
.chr = '\\',
294294
.subs = {
@@ -299,7 +299,7 @@ fr_sbuff_unescape_rules_t fr_value_unescape_single = {
299299
.do_oct = false
300300
};
301301

302-
fr_sbuff_unescape_rules_t fr_value_unescape_solidus = {
302+
fr_sbuff_unescape_rules_t const fr_value_unescape_solidus = {
303303
.name = "solidus",
304304
.chr = '\\',
305305
.subs = {
@@ -320,7 +320,7 @@ fr_sbuff_unescape_rules_t fr_value_unescape_solidus = {
320320
.do_oct = true
321321
};
322322

323-
fr_sbuff_unescape_rules_t fr_value_unescape_backtick = {
323+
fr_sbuff_unescape_rules_t const fr_value_unescape_backtick = {
324324
.name = "backtick",
325325
.chr = '\\',
326326
.subs = {
@@ -339,21 +339,21 @@ fr_sbuff_unescape_rules_t fr_value_unescape_backtick = {
339339
.do_oct = true
340340
};
341341

342-
fr_sbuff_unescape_rules_t *fr_value_unescape_by_quote[T_TOKEN_LAST] = {
342+
fr_sbuff_unescape_rules_t const *fr_value_unescape_by_quote[T_TOKEN_LAST] = {
343343
[T_DOUBLE_QUOTED_STRING] = &fr_value_unescape_double,
344344
[T_SINGLE_QUOTED_STRING] = &fr_value_unescape_single,
345345
[T_SOLIDUS_QUOTED_STRING] = &fr_value_unescape_solidus,
346346
[T_BACK_QUOTED_STRING] = &fr_value_unescape_backtick,
347347
};
348348

349-
fr_sbuff_unescape_rules_t *fr_value_unescape_by_char[SBUFF_CHAR_CLASS] = {
349+
fr_sbuff_unescape_rules_t const *fr_value_unescape_by_char[SBUFF_CHAR_CLASS] = {
350350
['"'] = &fr_value_unescape_double,
351351
['\''] = &fr_value_unescape_single,
352352
['/'] = &fr_value_unescape_solidus,
353353
['`'] = &fr_value_unescape_backtick,
354354
};
355355

356-
fr_sbuff_escape_rules_t fr_value_escape_double = {
356+
fr_sbuff_escape_rules_t const fr_value_escape_double = {
357357
.name = "double",
358358
.chr = '\\',
359359
.subs = {
@@ -384,14 +384,14 @@ fr_sbuff_escape_rules_t fr_value_escape_double = {
384384
* The length of the secret still leaks, but that is likely fine. Fixing that is more work.
385385
*
386386
*/
387-
fr_sbuff_escape_rules_t fr_value_escape_secret = {
387+
fr_sbuff_escape_rules_t const fr_value_escape_secret = {
388388
.name = "secret",
389389
.subs = {
390390
[ 0 ... 255 ] = '.',
391391
},
392392
};
393393

394-
fr_sbuff_escape_rules_t fr_value_escape_single = {
394+
fr_sbuff_escape_rules_t const fr_value_escape_single = {
395395
.name = "single",
396396
.chr = '\\',
397397
.subs = {
@@ -401,7 +401,7 @@ fr_sbuff_escape_rules_t fr_value_escape_single = {
401401
.do_utf8 = true,
402402
};
403403

404-
fr_sbuff_escape_rules_t fr_value_escape_solidus = {
404+
fr_sbuff_escape_rules_t const fr_value_escape_solidus = {
405405
.name = "solidus",
406406
.chr = '\\',
407407
.subs = {
@@ -422,7 +422,7 @@ fr_sbuff_escape_rules_t fr_value_escape_solidus = {
422422
.do_oct = true
423423
};
424424

425-
fr_sbuff_escape_rules_t fr_value_escape_backtick = {
425+
fr_sbuff_escape_rules_t const fr_value_escape_backtick = {
426426
.name = "backtick",
427427
.chr = '\\',
428428
.subs = {
@@ -444,21 +444,21 @@ fr_sbuff_escape_rules_t fr_value_escape_backtick = {
444444
.do_oct = true
445445
};
446446

447-
fr_sbuff_escape_rules_t *fr_value_escape_by_quote[T_TOKEN_LAST] = {
447+
fr_sbuff_escape_rules_t const *fr_value_escape_by_quote[T_TOKEN_LAST] = {
448448
[T_DOUBLE_QUOTED_STRING] = &fr_value_escape_double,
449449
[T_SINGLE_QUOTED_STRING] = &fr_value_escape_single,
450450
[T_SOLIDUS_QUOTED_STRING] = &fr_value_escape_solidus,
451451
[T_BACK_QUOTED_STRING] = &fr_value_escape_backtick,
452452
};
453453

454-
fr_sbuff_escape_rules_t *fr_value_escape_by_char[SBUFF_CHAR_CLASS] = {
454+
fr_sbuff_escape_rules_t const *fr_value_escape_by_char[SBUFF_CHAR_CLASS] = {
455455
['"'] = &fr_value_escape_double,
456456
['\''] = &fr_value_escape_single,
457457
['/'] = &fr_value_escape_solidus,
458458
['`'] = &fr_value_escape_backtick,
459459
};
460460

461-
fr_sbuff_escape_rules_t fr_value_escape_unprintables = {
461+
fr_sbuff_escape_rules_t const fr_value_escape_unprintables = {
462462
.name = "unprintables",
463463
.chr = '\\',
464464
.subs = {

‎src/lib/util/value.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,22 @@ extern size_t const fr_value_box_field_sizes[];
7070

7171
extern size_t const fr_value_box_offsets[];
7272

73-
extern fr_sbuff_unescape_rules_t fr_value_unescape_double;
74-
extern fr_sbuff_unescape_rules_t fr_value_unescape_single;
75-
extern fr_sbuff_unescape_rules_t fr_value_unescape_solidus;
76-
extern fr_sbuff_unescape_rules_t fr_value_unescape_backtick;
77-
extern fr_sbuff_unescape_rules_t *fr_value_unescape_by_quote[T_TOKEN_LAST];
78-
extern fr_sbuff_unescape_rules_t *fr_value_unescape_by_char[SBUFF_CHAR_CLASS];
79-
80-
extern fr_sbuff_escape_rules_t fr_value_escape_double;
81-
extern fr_sbuff_escape_rules_t fr_value_escape_single;
82-
extern fr_sbuff_escape_rules_t fr_value_escape_solidus;
83-
extern fr_sbuff_escape_rules_t fr_value_escape_backtick;
84-
extern fr_sbuff_escape_rules_t fr_value_escape_secret;
85-
extern fr_sbuff_escape_rules_t *fr_value_escape_by_quote[T_TOKEN_LAST];
86-
extern fr_sbuff_escape_rules_t *fr_value_escape_by_char[SBUFF_CHAR_CLASS];
87-
88-
extern fr_sbuff_escape_rules_t fr_value_escape_unprintables;
73+
extern fr_sbuff_unescape_rules_t const fr_value_unescape_double;
74+
extern fr_sbuff_unescape_rules_t const fr_value_unescape_single;
75+
extern fr_sbuff_unescape_rules_t const fr_value_unescape_solidus;
76+
extern fr_sbuff_unescape_rules_t const fr_value_unescape_backtick;
77+
extern fr_sbuff_unescape_rules_t const *fr_value_unescape_by_quote[T_TOKEN_LAST];
78+
extern fr_sbuff_unescape_rules_t const *fr_value_unescape_by_char[SBUFF_CHAR_CLASS];
79+
80+
extern fr_sbuff_escape_rules_t const fr_value_escape_double;
81+
extern fr_sbuff_escape_rules_t const fr_value_escape_single;
82+
extern fr_sbuff_escape_rules_t const fr_value_escape_solidus;
83+
extern fr_sbuff_escape_rules_t const fr_value_escape_backtick;
84+
extern fr_sbuff_escape_rules_t const fr_value_escape_secret;
85+
extern fr_sbuff_escape_rules_t const *fr_value_escape_by_quote[T_TOKEN_LAST];
86+
extern fr_sbuff_escape_rules_t const *fr_value_escape_by_char[SBUFF_CHAR_CLASS];
87+
88+
extern fr_sbuff_escape_rules_t const fr_value_escape_unprintables;
8989

9090
#ifndef NDEBUG
9191
# define FR_VALUE_BOX_MAGIC RADIUSD_MAGIC_NUMBER

0 commit comments

Comments
 (0)