Skip to content

style(mcp): compare nullable strings through one helper #2396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeusData merged 1 commit into from
Sep 28, 2026
+10 −6
Merged

style(mcp): compare nullable strings through one helper #2396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/mcp/mcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2723,18 +2723,23 @@ static void project_record_clear(mcp_project_record_t *record) {
memset(record, 0, sizeof(*record));
}

/* strcmp that orders NULL like "". */
static int nullable_strcmp(const char *a, const char *b) {
return strcmp(a ? a : "", b ? b : "");
}

static int project_record_compare(const void *left, const void *right) {
const mcp_project_record_t *a = left;
const mcp_project_record_t *b = right;
int by_name = strcmp(a->name ? a->name : "", b->name ? b->name : "");
int by_name = nullable_strcmp(a->name, b->name);
if (by_name != 0) {
return by_name;
}
int by_root = strcmp(a->root_path ? a->root_path : "", b->root_path ? b->root_path : "");
int by_root = nullable_strcmp(a->root_path, b->root_path);
if (by_root != 0) {
return by_root;
}
return strcmp(a->db_file ? a->db_file : "", b->db_file ? b->db_file : "");
return nullable_strcmp(a->db_file, b->db_file);
}

typedef enum {
Expand Down Expand Up @@ -12605,12 +12610,11 @@ static int search_result_cmp(const void *a, const void *b) {
if (score_order != 0) {
return score_order;
}
int qn_order = strcmp(ra->qualified_name ? ra->qualified_name : "",
rb->qualified_name ? rb->qualified_name : "");
int qn_order = nullable_strcmp(ra->qualified_name, rb->qualified_name);
if (qn_order != 0) {
return qn_order;
}
int file_order = strcmp(ra->file ? ra->file : "", rb->file ? rb->file : "");
int file_order = nullable_strcmp(ra->file, rb->file);
if (file_order != 0) {
return file_order;
}
Expand Down
Loading