Skip to content
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.

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

CDRIVER-5835 Rename set_error to kms_set_error #1811

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .evergreen/scripts/kms-divergence-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LIBMONGOCRYPT_DIR="$MONGOC_DIR/libmongocrypt-for-kms-divergence-check"

# LIBMONGOCRYPT_GITREF is expected to refer to the version of libmongocrypt
# where kms-message was last copied.
LIBMONGOCRYPT_GITREF="a650d171ed3b552446095817ae2c5c4f7cec43a2"
LIBMONGOCRYPT_GITREF="ea8af831bf067cc7eed7417ff4aef3c14cf1e67a"

cleanup() {
if [ -d "$LIBMONGOCRYPT_DIR" ]; then
Expand Down
2 changes: 1 addition & 1 deletion src/kms-message/src/kms_message.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <stdio.h>

void
set_error (char *error, size_t size, const char *fmt, ...)
kms_set_error (char *error, size_t size, const char *fmt, ...)
{
va_list va;

Expand Down
4 changes: 2 additions & 2 deletions src/kms-message/src/kms_message_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,12 @@ struct _kms_response_parser_t {
} while (0)

void
set_error (char *error, size_t size, const char *fmt, ...);
kms_set_error (char *error, size_t size, const char *fmt, ...);

#define KMS_ERROR(obj, ...) \
do { \
obj->failed = true; \
set_error (obj->error, sizeof (obj->error), __VA_ARGS__); \
kms_set_error (obj->error, sizeof (obj->error), __VA_ARGS__); \
} while (0)

#define KMS_ASSERT(stmt) \
Expand Down