Skip to content

Commit

Permalink
Rename push ignore deprecations and pop warnings macro from AZ_ to _a…
Browse files Browse the repository at this point in the history
…z_ to indicate they are for internal use only. (Azure#2474)

* Rename push ignore deprecations and pop warnings macro from AZ_ to _az_ to indicate they are for internal use only.

* Update paho_iot_pnp_with_provisioning_sample.c

* Update test_az_iot_provisioning_client_register_get_request_payload.c

* Update clang format to avoid unwanted indentation with statement macros
  • Loading branch information
ahsonkhan authored Jan 11, 2023
1 parent a22cff7 commit c317e45
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 20 deletions.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ Cpp11BracedListStyle: false
IndentCaseLabels: true
PenaltyReturnTypeOnItsOwnLine: 300
PointerAlignment: Left
StatementMacros: ['_az_PUSH_IGNORE_DEPRECATIONS', '_az_POP_WARNINGS']
...
8 changes: 4 additions & 4 deletions sdk/inc/azure/core/_az_cfg.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,12 @@
#endif // AZ_DEPRECATED

#ifdef _MSC_VER
#define AZ_PUSH_IGNORE_DEPRECATIONS _Pragma("warning(push)") _Pragma("warning(disable:4996)")
#define AZ_POP_WARNINGS _Pragma("warning(pop)")
#define _az_PUSH_IGNORE_DEPRECATIONS _Pragma("warning(push)") _Pragma("warning(disable:4996)")
#define _az_POP_WARNINGS _Pragma("warning(pop)")
#else // !_MSC_VER
#define AZ_PUSH_IGNORE_DEPRECATIONS \
#define _az_PUSH_IGNORE_DEPRECATIONS \
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
#define AZ_POP_WARNINGS _Pragma("GCC diagnostic pop")
#define _az_POP_WARNINGS _Pragma("GCC diagnostic pop")
#endif // _MSC_VER

#endif // _az_CFG_H
4 changes: 2 additions & 2 deletions sdk/samples/iot/paho_iot_pnp_with_provisioning_sample.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,15 +250,15 @@ static void register_device_with_provisioning_service(void)
uint8_t mqtt_payload[MQTT_PAYLOAD_BUFFER_LENGTH];
size_t mqtt_payload_length;

AZ_PUSH_IGNORE_DEPRECATIONS
_az_PUSH_IGNORE_DEPRECATIONS
rc = az_iot_provisioning_client_get_request_payload(
&provisioning_client,
custom_registration_payload_property,
NULL,
mqtt_payload,
sizeof(mqtt_payload),
&mqtt_payload_length);
AZ_POP_WARNINGS
_az_POP_WARNINGS
if (az_result_failed(rc))
{
IOT_SAMPLE_LOG_ERROR(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ static void test_az_iot_provisioning_client_get_request_payload_NULL_client_fail
uint8_t payload[TEST_PAYLOAD_RESERVE_SIZE];
size_t payload_len;

AZ_PUSH_IGNORE_DEPRECATIONS
_az_PUSH_IGNORE_DEPRECATIONS
ASSERT_PRECONDITION_CHECKED(az_iot_provisioning_client_get_request_payload(
NULL, AZ_SPAN_EMPTY, NULL, payload, sizeof(payload), &payload_len));
AZ_POP_WARNINGS
_az_POP_WARNINGS
}

static void test_az_iot_provisioning_client_get_request_payload_non_NULL_reserved_fails()
Expand All @@ -67,15 +67,15 @@ static void test_az_iot_provisioning_client_get_request_payload_non_NULL_reserve
uint8_t payload[TEST_PAYLOAD_RESERVE_SIZE];
size_t payload_len;

AZ_PUSH_IGNORE_DEPRECATIONS
_az_PUSH_IGNORE_DEPRECATIONS
ASSERT_PRECONDITION_CHECKED(az_iot_provisioning_client_get_request_payload(
&client,
AZ_SPAN_EMPTY,
(az_iot_provisioning_client_payload_options*)payload,
payload,
sizeof(payload),
&payload_len));
AZ_POP_WARNINGS
_az_POP_WARNINGS
}

static void test_az_iot_provisioning_client_get_request_payload_NULL_mqtt_payload_fails()
Expand All @@ -91,10 +91,10 @@ static void test_az_iot_provisioning_client_get_request_payload_NULL_mqtt_payloa

size_t payload_len;

AZ_PUSH_IGNORE_DEPRECATIONS
_az_PUSH_IGNORE_DEPRECATIONS
ASSERT_PRECONDITION_CHECKED(az_iot_provisioning_client_get_request_payload(
&client, AZ_SPAN_EMPTY, NULL, NULL, 1, &payload_len));
AZ_POP_WARNINGS
_az_POP_WARNINGS
}

static void test_az_iot_provisioning_client_get_request_payload_zero_payload_size_fails()
Expand All @@ -111,10 +111,10 @@ static void test_az_iot_provisioning_client_get_request_payload_zero_payload_siz
uint8_t payload[TEST_PAYLOAD_RESERVE_SIZE];
size_t payload_len;

AZ_PUSH_IGNORE_DEPRECATIONS
_az_PUSH_IGNORE_DEPRECATIONS
ASSERT_PRECONDITION_CHECKED(az_iot_provisioning_client_get_request_payload(
&client, AZ_SPAN_EMPTY, NULL, payload, 0, &payload_len));
AZ_POP_WARNINGS
_az_POP_WARNINGS
}

static void test_az_iot_provisioning_client_get_request_payload_NULL_payload_length_fails()
Expand All @@ -130,10 +130,10 @@ static void test_az_iot_provisioning_client_get_request_payload_NULL_payload_len

uint8_t payload[TEST_PAYLOAD_RESERVE_SIZE];

AZ_PUSH_IGNORE_DEPRECATIONS
_az_PUSH_IGNORE_DEPRECATIONS
ASSERT_PRECONDITION_CHECKED(az_iot_provisioning_client_get_request_payload(
&client, AZ_SPAN_EMPTY, NULL, payload, 1, NULL));
AZ_POP_WARNINGS
_az_POP_WARNINGS
}

static void test_az_iot_provisioning_client_register_get_request_payload_NULL_options_fails()
Expand Down Expand Up @@ -174,10 +174,10 @@ static void test_az_iot_provisioning_client_get_request_payload_no_custom_payloa
memset(payload, 0xCC, sizeof(payload));
size_t payload_len = 0xBAADC0DE;

AZ_PUSH_IGNORE_DEPRECATIONS
_az_PUSH_IGNORE_DEPRECATIONS
ret = az_iot_provisioning_client_get_request_payload(
&client, AZ_SPAN_EMPTY, NULL, payload, sizeof(payload), &payload_len);
AZ_POP_WARNINGS
_az_POP_WARNINGS
assert_int_equal(AZ_OK, ret);
assert_int_equal(payload_len, expected_payload_len);
assert_memory_equal(expected_payload, payload, expected_payload_len);
Expand All @@ -203,14 +203,14 @@ static void test_az_iot_provisioning_client_get_request_payload_custom_payload_s
memset(payload, 0xCC, sizeof(payload));
size_t payload_len = 0xBAADC0DE;

AZ_PUSH_IGNORE_DEPRECATIONS
_az_PUSH_IGNORE_DEPRECATIONS
ret = az_iot_provisioning_client_get_request_payload(
&client, test_custom_payload, NULL, payload, sizeof(payload), &payload_len);
assert_int_equal(AZ_OK, ret);
assert_int_equal(payload_len, expected_payload_len);
assert_memory_equal(expected_payload, payload, expected_payload_len);
assert_int_equal((uint8_t)0xCC, payload[expected_payload_len]);
AZ_POP_WARNINGS
_az_POP_WARNINGS
}

int test_az_iot_provisioning_client_register_get_request_payload()
Expand Down

0 comments on commit c317e45

Please sign in to comment.