aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2024-07-22 12:21:25 +0200
committerStefan Kangas2024-07-22 12:21:25 +0200
commitd995429e7bc2bc5b5d87db45dbbaca121f8118e5 (patch)
treecf68865ec986c1737fc62837365708e1f88ed73a
parentda0165a01e01dcb4334feee03b462ac09ceb0f8c (diff)
downloademacs-d995429e7bc2bc5b5d87db45dbbaca121f8118e5.tar.gz
emacs-d995429e7bc2bc5b5d87db45dbbaca121f8118e5.zip
Use SBYTES instead of strlen in treesit.c
* src/treesit.c (treesit_ensure_query_compiled) (Ftreesit_node_child_by_field_name, treesit_initialize_query): Use SBYTES instead of strlen.
-rw-r--r--src/treesit.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/treesit.c b/src/treesit.c
index a420ef77b2d..c95a9fb9b01 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1310,9 +1310,7 @@ treesit_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol,
1310 /* Create TSQuery. */ 1310 /* Create TSQuery. */
1311 uint32_t error_offset; 1311 uint32_t error_offset;
1312 TSQueryError error_type; 1312 TSQueryError error_type;
1313 char *treesit_source = SSDATA (source); 1313 treesit_query = ts_query_new (treesit_lang, SSDATA (source), SBYTES (source),
1314 treesit_query = ts_query_new (treesit_lang, treesit_source,
1315 strlen (treesit_source),
1316 &error_offset, &error_type); 1314 &error_offset, &error_type);
1317 if (treesit_query == NULL) 1315 if (treesit_query == NULL)
1318 { 1316 {
@@ -2159,11 +2157,10 @@ Return nil if there is no such child. If NODE is nil, return nil. */)
2159 CHECK_STRING (field_name); 2157 CHECK_STRING (field_name);
2160 treesit_initialize (); 2158 treesit_initialize ();
2161 2159
2162 char *name_str = SSDATA (field_name);
2163 TSNode treesit_node = XTS_NODE (node)->node; 2160 TSNode treesit_node = XTS_NODE (node)->node;
2164 TSNode child 2161 TSNode child
2165 = ts_node_child_by_field_name (treesit_node, name_str, 2162 = ts_node_child_by_field_name (treesit_node, SSDATA (field_name),
2166 strlen (name_str)); 2163 SBYTES (field_name));
2167 2164
2168 if (ts_node_is_null (child)) 2165 if (ts_node_is_null (child))
2169 return Qnil; 2166 return Qnil;
@@ -2888,10 +2885,9 @@ treesit_initialize_query (Lisp_Object query, const TSLanguage *lang,
2888 or a cons. */ 2885 or a cons. */
2889 if (CONSP (query)) 2886 if (CONSP (query))
2890 query = Ftreesit_query_expand (query); 2887 query = Ftreesit_query_expand (query);
2891 char *query_string = SSDATA (query);
2892 uint32_t error_offset; 2888 uint32_t error_offset;
2893 TSQueryError error_type; 2889 TSQueryError error_type;
2894 *ts_query = ts_query_new (lang, query_string, strlen (query_string), 2890 *ts_query = ts_query_new (lang, SSDATA (query), SBYTES (query),
2895 &error_offset, &error_type); 2891 &error_offset, &error_type);
2896 if (*ts_query == NULL) 2892 if (*ts_query == NULL)
2897 { 2893 {