diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2015-01-27 19:27:39 +0000 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2015-01-27 19:27:39 +0000 |
| commit | fcd1831e81470b36fe2119840f5262f935d6be23 (patch) | |
| tree | 2b90e82929df6acbcc95bd4444c1b4cc1c0e6545 /clang-plugin | |
| parent | bab1a574a6eab1f95576635e1392b106b52af977 (diff) | |
nullability: Rename a variable
Since (allow-none) is now (nullable) in GIR.
Diffstat (limited to 'clang-plugin')
| -rw-r--r-- | clang-plugin/nullability-checker.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang-plugin/nullability-checker.cpp b/clang-plugin/nullability-checker.cpp index d698186..ce3d47a 100644 --- a/clang-plugin/nullability-checker.cpp +++ b/clang-plugin/nullability-checker.cpp @@ -194,8 +194,8 @@ NullabilityVisitor::TraverseFunctionDecl (FunctionDecl* func) (nonnull_attr == NULL) ? MAYBE : (nonnull_attr->isNonNull (idx)) ? EXPLICIT_NONNULL: EXPLICIT_NULLABLE; - bool has_allow_none = (g_arg_info_may_be_null (&arg) || - g_arg_info_is_optional (&arg)); + bool has_nullable = (g_arg_info_may_be_null (&arg) || + g_arg_info_is_optional (&arg)); bool has_assertion = (asserted_parms.count (parm_decl) > 0); /* Analysis: @@ -229,7 +229,7 @@ NullabilityVisitor::TraverseFunctionDecl (FunctionDecl* func) * variable in question, since (nullable) will not affect the * nullability of an out function parameter. */ - if (has_nonnull == EXPLICIT_NONNULL && has_allow_none) { + if (has_nonnull == EXPLICIT_NONNULL && has_nullable) { Debug::emit_error ( "Conflict between nonnull attribute and " "(nullable), (optional) or (allow-none) " @@ -239,7 +239,7 @@ NullabilityVisitor::TraverseFunctionDecl (FunctionDecl* func) parm_decl->getLocStart ()) << parm_decl->getNameAsString () << func->getNameAsString (); - } else if (has_allow_none && has_assertion) { + } else if (has_nullable && has_assertion) { Debug::emit_error ( "Conflict between (nullable), (optional) or " "(allow-none) annotation and " @@ -249,7 +249,7 @@ NullabilityVisitor::TraverseFunctionDecl (FunctionDecl* func) parm_decl->getLocStart ()) << parm_decl->getNameAsString () << func->getNameAsString (); - } else if (!has_allow_none && !has_assertion) { + } else if (!has_nullable && !has_assertion) { switch (has_nonnull) { case EXPLICIT_NULLABLE: Debug::emit_warning ( |