Fix some cppcheck reports: #11
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc. [ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used. [ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used. [ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used. [ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used. [ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used.
|
Hello Julien, Thank you for your contribution! Similar to other open source projects, the MariaDB Corporation needs to have shared ownership of all code that is included in the MariaDB C/ODBC distribution. The easiest way to achieve this is by submitting your code under the BSD-new license. The other alternative is to sign the code contribution agreement which can be found here: https://mariadb.com/kb/en/mariadb/mca/ Please indicate in a comment below that you are contributing your new code of the whole pull request, including one or several files that are either new files or modified ones, under the BSD-new license or that you have filled out the contribution agreement and sent it. Best regards, |
lawrinn
reviewed
Oct 15, 2016
| @@ -86,7 +86,7 @@ MADB_Desc *MADB_DescInit(MADB_Dbc *Dbc,enum enum_madb_desc_type DescType, my_boo | |||
| MADB_FREE(Desc); | |||
| Desc= NULL; | |||
| } | |||
| if (isExternal) | |||
| if (Desc && isExternal) | |||
There was a problem hiding this comment.
I guess would be cleaner to change both "Desc= NULL" to "return NULL", and remove Desc checks
lawrinn
reviewed
Oct 15, 2016
| @@ -1312,12 +1309,13 @@ SQLRETURN MADB_StmtExecute(MADB_Stmt *Stmt) | |||
| SQLRETURN MADB_StmtBindCol(MADB_Stmt *Stmt, SQLUSMALLINT ColumnNumber, SQLSMALLINT TargetType, | |||
| SQLPOINTER TargetValuePtr, SQLLEN BufferLength, SQLLEN *StrLen_or_Ind) | |||
| { | |||
| MADB_Desc *Ard= Stmt->Ard; | |||
| MADB_Desc *Ard; | |||
| MADB_DescRecord *Record; | |||
|
|
|||
| if (!Stmt) | |||
There was a problem hiding this comment.
This test is redundant. I guess it is better to remove it, and leave initialization as is
lawrinn
reviewed
Oct 15, 2016
| SQLULEN ArraySize= Stmt->Ard->Header.ArraySize; | ||
| MADB_Desc *ArdDesc= Stmt->Ard; | ||
| SQLULEN ArraySize; | ||
| MADB_Desc *ArdDesc; | ||
| MYSQL_ROWS *SaveCursor= NULL; | ||
|
|
||
| if (!Stmt || !Stmt->stmt) |
There was a problem hiding this comment.
Same here - !Stmt is safe to remove from here, and leave only !Stmt->stmt, and leave initialization as is
[ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc. [ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used. [ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used. [ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used. [ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used. [ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used. All of my past & future contributions to MariaDB may be licensed under the BSD-new license.
|
Thank you Lawrinn for your feedback. I tried to apply what you suggested:
|
[ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc. [ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used. [ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used. [ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used. [ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used. [ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used. All of my past & future contributions to MariaDB may be licensed under the BSD-new license.
[ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc. [ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used. [ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used. [ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used. [ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used. [ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used. All of my past & future contributions to MariaDB may be licensed under the BSD-new license.
[ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc. [ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used. [ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used. [ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used. [ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used. [ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used. All of my past & future contributions to MariaDB may be licensed under the BSD-new license.
lawrinn
pushed a commit
that referenced
this pull request
Oct 17, 2016
* Fix some cppcheck reports: [ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc. [ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used. [ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used. [ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used. [ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used. [ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used. * Fix some cppcheck reports: [ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc. [ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used. [ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used. [ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used. [ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used. [ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used. All of my past & future contributions to MariaDB may be licensed under the BSD-new license. * Fix some cppcheck reports: [ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc. [ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used. [ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used. [ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used. [ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used. [ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used. All of my past & future contributions to MariaDB may be licensed under the BSD-new license. * Fix some cppcheck reports: [ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc. [ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used. [ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used. [ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used. [ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used. [ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used. All of my past & future contributions to MariaDB may be licensed under the BSD-new license. * Fix some cppcheck reports: [ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc. [ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used. [ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used. [ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used. [ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used. [ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt. [ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used. All of my past & future contributions to MariaDB may be licensed under the BSD-new license.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[ma_desc.c:107] -> [ma_desc.c:104]: (warning) Either the condition 'Desc' is redundant or there is possible null pointer dereference: Desc.
[ma_parse.c:45]: (style) Variable 'p' is assigned a value that is never used.
[ma_parse.c:46]: (style) Variable 'Tokens' is assigned a value that is never used.
[ma_statement.c:113]: (style) Variable 'NewStmt' is assigned a value that is never used.
[ma_statement.c:444]: (style) Variable 'Length' is assigned a value that is never used.
[ma_statement.c:1315] -> [ma_statement.c:1318]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt.
[ma_statement.c:1798] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt.
[ma_statement.c:1799] -> [ma_statement.c:1802]: (warning) Either the condition '!Stmt' is redundant or there is possible null pointer dereference: Stmt.
[ma_string.c:88]: (style) Variable 'Count' is assigned a value that is never used.