diff options
author | Aaron Ballman <aaron@aaronballman.com> | 2022-02-12 07:23:43 -0500 |
---|---|---|
committer | Aaron Ballman <aaron@aaronballman.com> | 2022-02-12 07:25:06 -0500 |
commit | 0dd49a5628bbe01cecf6516017da59ae44863ab3 (patch) | |
tree | d5e2772c3170d94f110217d59b1a5ac78c4d2420 /clang/test/Rewriter | |
parent | 7ad94bd74bb5e2c984f541bc1921a9eda73ed973 (diff) | |
download | llvm-0dd49a5628bbe01cecf6516017da59ae44863ab3.zip llvm-0dd49a5628bbe01cecf6516017da59ae44863ab3.tar.gz llvm-0dd49a5628bbe01cecf6516017da59ae44863ab3.tar.bz2 |
Use functions with prototypes when appropriate; NFC
A significant number of our tests in C accidentally use functions
without prototypes. This patch converts the function signatures to have
a prototype for the situations where the test is not specific to K&R C
declarations. e.g.,
void func();
becomes
void func(void);
This is the eighth batch of tests being updated (there are a
significant number of other tests left to be updated).
Diffstat (limited to 'clang/test/Rewriter')
-rw-r--r-- | clang/test/Rewriter/blockstruct.m | 4 | ||||
-rw-r--r-- | clang/test/Rewriter/crash.m | 4 | ||||
-rw-r--r-- | clang/test/Rewriter/finally.m | 6 | ||||
-rw-r--r-- | clang/test/Rewriter/objc-synchronized-1.m | 8 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-captured-nested-bvar.c | 4 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-foreach-1.m | 2 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-foreach-2.m | 6 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-foreach-3.m | 2 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-foreach-4.m | 2 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-foreach-7.m | 2 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-modern-synchronized.m | 10 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-modern-throw.m | 12 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-modern-try-catch-finally.m | 10 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-modern-try-finally.m | 10 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-try-catch.m | 4 | ||||
-rw-r--r-- | clang/test/Rewriter/rewrite-weak-attr.m | 4 | ||||
-rw-r--r-- | clang/test/Rewriter/undef-field-reference-1.m | 2 | ||||
-rw-r--r-- | clang/test/Rewriter/weak_byref_objects.m | 4 |
18 files changed, 48 insertions, 48 deletions
diff --git a/clang/test/Rewriter/blockstruct.m b/clang/test/Rewriter/blockstruct.m index 2c44361..477afb4 100644 --- a/clang/test/Rewriter/blockstruct.m +++ b/clang/test/Rewriter/blockstruct.m @@ -7,9 +7,9 @@ void a(b_t work) { } struct _s { int a; }; -struct _s *r(); +struct _s *r(void); -void f() { +void f(void) { __block struct _s *s = 0; a(^{ s = (struct _s *)r(); diff --git a/clang/test/Rewriter/crash.m b/clang/test/Rewriter/crash.m index 7908d9f..55d7a03 100644 --- a/clang/test/Rewriter/crash.m +++ b/clang/test/Rewriter/crash.m @@ -7,7 +7,7 @@ @interface NSConstantString {} @end -int main() { +int main(void) { id foo = [NSArray arrayWithObjects:@"1", @"2", @"3", @"4", @"5", @"6", @"7", @"8", @"9", @"10", @"11", @"12", 0]; return 0; } @@ -19,7 +19,7 @@ int main() { @interface Foo @end -void func() { +void func(void) { id <A> obj = (id <A>)[Foo bar]; } diff --git a/clang/test/Rewriter/finally.m b/clang/test/Rewriter/finally.m index e60ba9e..33b919e 100644 --- a/clang/test/Rewriter/finally.m +++ b/clang/test/Rewriter/finally.m @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 -fobjc-exceptions -verify %s -o - -int main() { +int main(void) { @try { printf("executing try"); // expected-warning{{implicitly declaring library function 'printf' with type 'int (const char *, ...)'}} \ // expected-note{{include the header <stdio.h> or explicitly provide a declaration for 'printf'}} @@ -25,14 +25,14 @@ int main() { return 0; } -void test_sync_with_implicit_finally() { +void test_sync_with_implicit_finally(void) { id foo; @synchronized (foo) { return; // The rewriter knows how to generate code for implicit finally } } -void test2_try_with_implicit_finally() { +void test2_try_with_implicit_finally(void) { @try { return; // The rewriter knows how to generate code for implicit finally } @catch (id e) { diff --git a/clang/test/Rewriter/objc-synchronized-1.m b/clang/test/Rewriter/objc-synchronized-1.m index 0e985ab..9172a13 100644 --- a/clang/test/Rewriter/objc-synchronized-1.m +++ b/clang/test/Rewriter/objc-synchronized-1.m @@ -1,9 +1,9 @@ // RUN: %clang_cc1 -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o - -id SYNCH_EXPR(); -void SYNCH_BODY(); -void SYNCH_BEFORE(); -void SYNC_AFTER(); +id SYNCH_EXPR(void); +void SYNCH_BODY(void); +void SYNCH_BEFORE(void); +void SYNC_AFTER(void); void foo(id sem) { diff --git a/clang/test/Rewriter/rewrite-captured-nested-bvar.c b/clang/test/Rewriter/rewrite-captured-nested-bvar.c index 1b624e0..60029e7 100644 --- a/clang/test/Rewriter/rewrite-captured-nested-bvar.c +++ b/clang/test/Rewriter/rewrite-captured-nested-bvar.c @@ -6,7 +6,7 @@ void q(void (^p)(void)) { p(); } -void f() { +void f(void) { __block char BYREF_VAR_CHECK = 'a'; __block char d = 'd'; q(^{ @@ -25,7 +25,7 @@ void f() { }); } -int main() { +int main(void) { f(); return 0; } diff --git a/clang/test/Rewriter/rewrite-foreach-1.m b/clang/test/Rewriter/rewrite-foreach-1.m index 5263fff..dcfa6e8 100644 --- a/clang/test/Rewriter/rewrite-foreach-1.m +++ b/clang/test/Rewriter/rewrite-foreach-1.m @@ -16,7 +16,7 @@ - (void)compilerTestAgainst; @end -int LOOP(); +int LOOP(void); @implementation MyList (BasicTest) - (void)compilerTestAgainst { id el; diff --git a/clang/test/Rewriter/rewrite-foreach-2.m b/clang/test/Rewriter/rewrite-foreach-2.m index 120d7d7..a0f7db3 100644 --- a/clang/test/Rewriter/rewrite-foreach-2.m +++ b/clang/test/Rewriter/rewrite-foreach-2.m @@ -16,9 +16,9 @@ - (void)compilerTestAgainst; @end -int LOOP(); -int INNERLOOP(); -void END_LOOP(); +int LOOP(void); +int INNERLOOP(void); +void END_LOOP(void); @implementation MyList (BasicTest) - (void)compilerTestAgainst { id el; diff --git a/clang/test/Rewriter/rewrite-foreach-3.m b/clang/test/Rewriter/rewrite-foreach-3.m index 6e67415..4edbe80 100644 --- a/clang/test/Rewriter/rewrite-foreach-3.m +++ b/clang/test/Rewriter/rewrite-foreach-3.m @@ -16,7 +16,7 @@ - (void)compilerTestAgainst; @end -int LOOP(); +int LOOP(void); @implementation MyList (BasicTest) - (void)compilerTestAgainst { MyList * el; diff --git a/clang/test/Rewriter/rewrite-foreach-4.m b/clang/test/Rewriter/rewrite-foreach-4.m index e852c75c..50f95e4 100644 --- a/clang/test/Rewriter/rewrite-foreach-4.m +++ b/clang/test/Rewriter/rewrite-foreach-4.m @@ -16,7 +16,7 @@ - (void)compilerTestAgainst; @end -int LOOP(); +int LOOP(void); @implementation MyList (BasicTest) - (void)compilerTestAgainst { MyList * el; diff --git a/clang/test/Rewriter/rewrite-foreach-7.m b/clang/test/Rewriter/rewrite-foreach-7.m index 8f3a7c8..079825b 100644 --- a/clang/test/Rewriter/rewrite-foreach-7.m +++ b/clang/test/Rewriter/rewrite-foreach-7.m @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o - @class NSArray; -int main() { +int main(void) { NSArray *foo; for (Class c in foo) { } } diff --git a/clang/test/Rewriter/rewrite-modern-synchronized.m b/clang/test/Rewriter/rewrite-modern-synchronized.m index 17c8e9a..59bc87d 100644 --- a/clang/test/Rewriter/rewrite-modern-synchronized.m +++ b/clang/test/Rewriter/rewrite-modern-synchronized.m @@ -7,10 +7,10 @@ typedef struct objc_object { void *sel_registerName(const char *); -id SYNCH_EXPR(); -void SYNCH_BODY(); -void SYNCH_BEFORE(); -void SYNC_AFTER(); +id SYNCH_EXPR(void); +void SYNCH_BODY(void); +void SYNCH_BEFORE(void); +void SYNC_AFTER(void); void foo(id sem) { @@ -26,7 +26,7 @@ void foo(id sem) } } -void test_sync_with_implicit_finally() { +void test_sync_with_implicit_finally(void) { id foo; @synchronized (foo) { return; // The rewriter knows how to generate code for implicit finally diff --git a/clang/test/Rewriter/rewrite-modern-throw.m b/clang/test/Rewriter/rewrite-modern-throw.m index 19d6b1f..e2a2acd 100644 --- a/clang/test/Rewriter/rewrite-modern-throw.m +++ b/clang/test/Rewriter/rewrite-modern-throw.m @@ -9,17 +9,17 @@ typedef struct objc_object { void *sel_registerName(const char *); @interface Foo @end -void TRY(); -void SPLATCH(); -void MYTRY(); -void MYCATCH(); +void TRY(void); +void SPLATCH(void); +void MYTRY(void); +void MYCATCH(void); -void foo() { +void foo(void) { @try { TRY(); } @catch (...) { SPLATCH(); @throw; } } -int main() +int main(void) { @try { diff --git a/clang/test/Rewriter/rewrite-modern-try-catch-finally.m b/clang/test/Rewriter/rewrite-modern-try-catch-finally.m index 9beab7d..cdf79db 100644 --- a/clang/test/Rewriter/rewrite-modern-try-catch-finally.m +++ b/clang/test/Rewriter/rewrite-modern-try-catch-finally.m @@ -8,7 +8,7 @@ typedef struct objc_object { extern int printf(const char *, ...); -int main() { +int main(void) { @try { } @finally { @@ -30,7 +30,7 @@ int main() { return 0; } -void test2_try_with_implicit_finally() { +void test2_try_with_implicit_finally(void) { @try { return; } @catch (id e) { @@ -38,9 +38,9 @@ void test2_try_with_implicit_finally() { } } -void FINALLY(); -void TRY(); -void CATCH(); +void FINALLY(void); +void TRY(void); +void CATCH(void); @interface NSException @end diff --git a/clang/test/Rewriter/rewrite-modern-try-finally.m b/clang/test/Rewriter/rewrite-modern-try-finally.m index 41737e9..b964c6f 100644 --- a/clang/test/Rewriter/rewrite-modern-try-finally.m +++ b/clang/test/Rewriter/rewrite-modern-try-finally.m @@ -6,11 +6,11 @@ typedef struct objc_object { Class isa; } *id; -void FINALLY(); -void TRY(); -void INNER_FINALLY(); -void INNER_TRY(); -void CHECK(); +void FINALLY(void); +void TRY(void); +void INNER_FINALLY(void); +void INNER_TRY(void); +void CHECK(void); @interface Foo @end diff --git a/clang/test/Rewriter/rewrite-try-catch.m b/clang/test/Rewriter/rewrite-try-catch.m index 8720d0c..8ac87f5 100644 --- a/clang/test/Rewriter/rewrite-try-catch.m +++ b/clang/test/Rewriter/rewrite-try-catch.m @@ -3,12 +3,12 @@ @interface Foo @end @interface GARF @end -void foo() { +void foo(void) { @try { TRY(); } @catch (...) { SPLATCH(); @throw; } } -int main() +int main(void) { @try { diff --git a/clang/test/Rewriter/rewrite-weak-attr.m b/clang/test/Rewriter/rewrite-weak-attr.m index f8eb3b7..196f1d3c 100644 --- a/clang/test/Rewriter/rewrite-weak-attr.m +++ b/clang/test/Rewriter/rewrite-weak-attr.m @@ -1,10 +1,10 @@ // RUN: %clang_cc1 -triple i686-pc-win32 -fms-extensions -fblocks -Dnil=0 -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 -o - %s -int main() { +int main(void) { __weak __block id foo = nil; __block id foo2 = nil; id foo3 = nil; - void (^myblock)() = ^{ + void (^myblock)(void) = ^{ foo = nil; foo2 = nil; [foo3 bar]; diff --git a/clang/test/Rewriter/undef-field-reference-1.m b/clang/test/Rewriter/undef-field-reference-1.m index 07bd21b..3bffd38 100644 --- a/clang/test/Rewriter/undef-field-reference-1.m +++ b/clang/test/Rewriter/undef-field-reference-1.m @@ -8,7 +8,7 @@ @end MyDerived *pd; -int main() { +int main(void) { return pd->IVAR; } diff --git a/clang/test/Rewriter/weak_byref_objects.m b/clang/test/Rewriter/weak_byref_objects.m index 09d30ed..52111c1 100644 --- a/clang/test/Rewriter/weak_byref_objects.m +++ b/clang/test/Rewriter/weak_byref_objects.m @@ -1,12 +1,12 @@ // RUN: %clang_cc1 -fblocks -triple i386-apple-darwin9 -fobjc-gc -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o - #define nil 0 -int main() { +int main(void) { __weak __block id foo = nil; __block id foo2 = nil; id foo3 = nil; - void (^myblock)() = ^{ + void (^myblock)(void) = ^{ foo = nil; foo2 = nil; [foo3 bar]; |