Skip to content
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 examples/kms_discovery.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ int main(int argc, char **argv) {

/* This keyring is guaranteed to only call KMS to attempt decryptions
* in eu-central-1, and it will only attempt to do so when it sees that
* the message has beeen encrypted by this specific CMK.
* the message has been encrypted by this specific CMK.
*/
decryption_keyrings.push_back(Aws::Cryptosdk::KmsKeyring::Builder().Build(key_arn_eu_central_1));

Expand Down
2 changes: 1 addition & 1 deletion examples/string.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ int main(int argc, char **argv) {
return ret;
}

/* We need to intialize the AWS SDK for C++ when we use the C++ KMS keyring. */
/* We need to initialize the AWS SDK for C++ when we use the C++ KMS keyring. */
Aws::SDKOptions options;
Aws::InitAPI(options);

Expand Down
2 changes: 1 addition & 1 deletion examples/string_alternate_algorithm_suite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ int main(int argc, char **argv) {
return ret;
}

/* We need to intialize the AWS SDK for C++ when we use the C++ KMS keyring. */
/* We need to initialize the AWS SDK for C++ when we use the C++ KMS keyring. */
Aws::SDKOptions options;
Aws::InitAPI(options);

Expand Down
2 changes: 1 addition & 1 deletion examples/string_legacy_compatibility.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ int main(int argc, char **argv) {
return ret;
}

/* We need to intialize the AWS SDK for C++ when we use the C++ KMS keyring. */
/* We need to initialize the AWS SDK for C++ when we use the C++ KMS keyring. */
Aws::SDKOptions options;
Aws::InitAPI(options);

Expand Down
2 changes: 1 addition & 1 deletion include/aws/cryptosdk/error.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ enum aws_cryptosdk_err {
* Implicitly registers error strings for aws-c-common as well.
*/
AWS_CRYPTOSDK_API
void aws_cryptosdk_load_error_strings();
void aws_cryptosdk_load_error_strings(void);

#ifdef __cplusplus
}
Expand Down
2 changes: 1 addition & 1 deletion source/cipher.c
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ static int evp_gcm_encrypt_final(const struct aws_cryptosdk_alg_properties *prop
return AWS_ERROR_SUCCESS;
}

static inline void flush_openssl_errors() {
static inline void flush_openssl_errors(void) {
while (ERR_get_error() != 0) {
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/error.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ static const struct aws_error_info error_info[] = {
static const struct aws_error_info_list error_info_list = { .error_list = error_info,
.count = sizeof(error_info) / sizeof(error_info[0]) };

void aws_cryptosdk_load_error_strings() {
void aws_cryptosdk_load_error_strings(void) {
aws_register_error_info(&error_info_list);
}
4 changes: 2 additions & 2 deletions tests/integration/t_local_cache_threading.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ struct rand_state {
#define RNG_GENERATOR 16807
#define RNG_MAX (RNG_MODULUS - 1)

static unsigned long threadid_get_callback() {
return aws_thread_current_thread_id();
static unsigned long threadid_get_callback(void) {
return (unsigned long)aws_thread_current_thread_id();
}

static struct aws_mutex *mutex_array = NULL;
Expand Down
Loading