Skip to content

Commit

Permalink
Fix new warnings shown by Xcode 14.3 (#92)
Browse files Browse the repository at this point in the history
  • Loading branch information
paulb777 authored Apr 3, 2023
1 parent fe7ebfd commit cc7265b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v9.2.2
- Fix new warnings shown by Xcode 14.3.

# v9.2.1
- Add `GDTCORTarget` documentation and use Google domain in testing URL. (#89)

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'GoogleDataTransport'
s.version = '9.2.1'
s.version = '9.2.2'
s.summary = 'Google iOS SDK data transport.'

s.description = <<-DESC
Expand Down
10 changes: 5 additions & 5 deletions GoogleDataTransport/GDTCCTLibrary/GDTCCTNanopbHelpers.m
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ gdt_cct_LogEvent GDTCCTConstructLogEvent(GDTCOREvent *event) {
return logEvent;
}

gdt_cct_ClientInfo GDTCCTConstructClientInfo() {
gdt_cct_ClientInfo GDTCCTConstructClientInfo(void) {
gdt_cct_ClientInfo clientInfo = gdt_cct_ClientInfo_init_default;
clientInfo.client_type = gdt_cct_ClientInfo_ClientType_IOS_FIREBASE;
clientInfo.has_client_type = 1;
Expand All @@ -177,7 +177,7 @@ gdt_cct_ClientInfo GDTCCTConstructClientInfo() {
return clientInfo;
}

gdt_cct_IosClientInfo GDTCCTConstructiOSClientInfo() {
gdt_cct_IosClientInfo GDTCCTConstructiOSClientInfo(void) {
gdt_cct_IosClientInfo iOSClientInfo = gdt_cct_IosClientInfo_init_default;
#if TARGET_OS_IOS || TARGET_OS_TV
UIDevice *device = [UIDevice currentDevice];
Expand All @@ -203,7 +203,7 @@ gdt_cct_IosClientInfo GDTCCTConstructiOSClientInfo() {
return iOSClientInfo;
}

gdt_cct_MacClientInfo GDTCCTConstructMacClientInfo() {
gdt_cct_MacClientInfo GDTCCTConstructMacClientInfo(void) {
gdt_cct_MacClientInfo macOSClientInfo = gdt_cct_MacClientInfo_init_default;

NSOperatingSystemVersion osVersion = [NSProcessInfo processInfo].operatingSystemVersion;
Expand Down Expand Up @@ -231,7 +231,7 @@ gdt_cct_MacClientInfo GDTCCTConstructMacClientInfo() {
return macOSClientInfo;
}

NSData *GDTCCTConstructNetworkConnectionInfoData() {
NSData *GDTCCTConstructNetworkConnectionInfoData(void) {
gdt_cct_NetworkConnectionInfo networkConnectionInfo = gdt_cct_NetworkConnectionInfo_init_default;
NSInteger currentNetworkType = GDTCORNetworkTypeMessage();
if (currentNetworkType) {
Expand All @@ -252,7 +252,7 @@ gdt_cct_MacClientInfo GDTCCTConstructMacClientInfo() {
return networkConnectionInfoData;
}

gdt_cct_NetworkConnectionInfo_MobileSubtype GDTCCTNetworkConnectionInfoNetworkMobileSubtype() {
gdt_cct_NetworkConnectionInfo_MobileSubtype GDTCCTNetworkConnectionInfoNetworkMobileSubtype(void) {
NSNumber *networkMobileSubtypeMessage = @(GDTCORNetworkMobileSubTypeMessage());
if (!networkMobileSubtypeMessage.intValue) {
return gdt_cct_NetworkConnectionInfo_MobileSubtype_UNKNOWN_MOBILE_SUBTYPE;
Expand Down
4 changes: 2 additions & 2 deletions GoogleDataTransport/GDTCORLibrary/GDTCORClock.m
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
* @return The KERN_BOOTTIME property from sysctl, in nanoseconds.
*/
static int64_t KernelBootTimeInNanoseconds() {
static int64_t KernelBootTimeInNanoseconds(void) {
// Caching the result is not possible because clock drift would not be accounted for.
struct timeval boottime;
int mib[2] = {CTL_KERN, KERN_BOOTTIME};
Expand All @@ -59,7 +59,7 @@ static int64_t KernelBootTimeInNanoseconds() {
*
* @return The value of gettimeofday, in nanoseconds.
*/
static int64_t UptimeInNanoseconds() {
static int64_t UptimeInNanoseconds(void) {
int64_t before_now_nsec;
int64_t after_now_nsec;
struct timeval now;
Expand Down
6 changes: 3 additions & 3 deletions GoogleDataTransport/GDTCORLibrary/GDTCORPlatform.m
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ BOOL GDTCORReachabilityFlagsContainWWAN(GDTCORNetworkReachabilityFlags flags) {
#endif // TARGET_OS_IOS
}

GDTCORNetworkType GDTCORNetworkTypeMessage() {
GDTCORNetworkType GDTCORNetworkTypeMessage(void) {
#if !TARGET_OS_WATCH
SCNetworkReachabilityFlags reachabilityFlags = [GDTCORReachability currentFlags];
if ((reachabilityFlags & kSCNetworkReachabilityFlagsReachable) ==
Expand All @@ -99,7 +99,7 @@ GDTCORNetworkType GDTCORNetworkTypeMessage() {
return GDTCORNetworkTypeUNKNOWN;
}

GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage(void) {
#if TARGET_OS_IOS
static NSDictionary<NSString *, NSNumber *> *CTRadioAccessTechnologyToNetworkSubTypeMessage;
static CTTelephonyNetworkInfo *networkInfo;
Expand Down Expand Up @@ -154,7 +154,7 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
#endif // TARGET_OS_IOS
}

NSString *_Nonnull GDTCORDeviceModel() {
NSString *_Nonnull GDTCORDeviceModel(void) {
static NSString *deviceModel = @"Unknown";

#if TARGET_OS_IOS || TARGET_OS_TV
Expand Down

0 comments on commit cc7265b

Please sign in to comment.