Skip to content

libatalk: Simplify error logging on parameter error in cnid_mysql_find() #2515

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
merged 1 commit into from
Nov 12, 2025
Merged

libatalk: Simplify error logging on parameter error in cnid_mysql_find() #2515

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
7 changes: 3 additions & 4 deletions libatalk/cnid/mysql/cnid_mysql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ int cnid_mysql_find(struct _cnid_db *cdb, const char *name, size_t namelen,
void *buffer, size_t buflen)
{
EC_INIT;
CNID_mysql_private *db;
CNID_mysql_private *db = cdb->cnid_db_private;
char *sql = NULL;
char *namelike = NULL;
MYSQL_RES *result = NULL;
Expand All @@ -827,9 +827,8 @@ int cnid_mysql_find(struct _cnid_db *cdb, const char *name, size_t namelen,
"cnid_mysql_find: called with name='%s', namelen=%zu, buflen=%zu", name,
namelen, buflen);

if (!cdb || !(db = cdb->cnid_db_private) || !name) {
LOG(log_error, logtype_cnid,
"cnid_mysql_find: Parameter error (cdb=%p, db=%p, name=%p)", cdb, db, name);
if (!cdb || !db || !name) {
LOG(log_error, logtype_cnid, "cnid_mysql_find: Parameter error");
errno = CNID_ERR_PARAM;
EC_FAIL;
}
Expand Down