Quell cppcheck warnings

kit/dwt.c

@@ -318,9 +318,6 @@ int dwtdll_cleanup(RIG *rig)
 {
 	struct dwtdll_priv_data *priv = (struct dwtdll_priv_data *)rig->state.priv;
 
-	if (!rig)
-		return -RIG_EINVAL;
-
 	/* Clean up the dll access */
 	FreeLibrary(priv->dll);
 

kit/elektor507.c

@@ -305,9 +305,6 @@ int elektor507_cleanup(RIG *rig)
 {
 	struct elektor507_priv_data *priv = (struct elektor507_priv_data *)rig->state.priv;
 
-	if (!rig)
-		return -RIG_EINVAL;
-
 	/* Clean up the dll access */
 	FreeLibrary(priv->extra_priv.dll);
 

tests/memcsv.c

@@ -114,10 +114,12 @@ int csv_load (RIG *rig, const char *infilename)
       /* Tokenize the key list */
       if( !tokenize_line( keys, key_list, sizeof(key_list)/sizeof(char*), ',' ) ){
          fprintf( stderr, "Invalid (possibly too long or empty) key line, cannot continue.\n" );
+         fclose(f);
          return -1;
       }
    }else{
       /* File exists, but is empty */
+      fclose(f);
       return -1;
    }
 
@@ -136,6 +138,7 @@ int csv_load (RIG *rig, const char *infilename)
 
       if (status != RIG_OK ) {
             fprintf( stderr, "rig_get_channel: error = %s \n", rigerror(status));
+            fclose(f);
             return status;
       }
 

winradio/g303.c

@@ -254,9 +254,6 @@ int g3_cleanup(RIG *rig)
 {
 	struct g3_priv_data *priv = (struct g3_priv_data *)rig->state.priv;
 
-	if (!rig)
-		return -RIG_EINVAL;
-
 	/* Clean up the dll access */
 	FreeLibrary(priv->dll);
 

winradio/g305.c

@@ -255,9 +255,6 @@ int g3_cleanup(RIG *rig)
 {
 	struct g3_priv_data *priv = (struct g3_priv_data *)rig->state.priv;
 
-	if (!rig)
-		return -RIG_EINVAL;
-
 	/* Clean up the dll access */
 	FreeLibrary(priv->dll);
 

yaesu/ft757gx.c

@@ -323,9 +323,6 @@ int ft757_cleanup(RIG *rig)
 {
     rig_debug(RIG_DEBUG_VERBOSE, "%s called.\n", __func__);
 
-    if (!rig)
-        return -RIG_EINVAL;
-
     if (rig->state.priv)
         free(rig->state.priv);
     rig->state.priv = NULL;
@@ -345,9 +342,6 @@ int ft757_open(RIG *rig)
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called.\n", __func__);
 
-    if (!rig)
-        return -RIG_EINVAL;
-
     /* FT757GX has a write-only serial port: don't try to read status data */
     if (rig->caps->rig_model == RIG_MODEL_FT757) {
       memset(priv->update_data, 0, FT757GX_STATUS_UPDATE_DATA_LENGTH);