diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2014-03-20 07:26:26 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2014-03-20 19:14:53 +0000 |
| commit | bbd8f85de49ba3727e9820c7db53e34cdf840a6a (patch) | |
| tree | b73c0b009385c1f5c530dab09e8d1abf2ca50456 | |
| parent | abd31397fa246823179f2356ce6dff8987b2b265 (diff) | |
| download | swig-bbd8f85de49ba3727e9820c7db53e34cdf840a6a.tar.gz | |
Forward null fix for Coverity analysis
| -rw-r--r-- | Source/Modules/csharp.cxx | 6 | ||||
| -rw-r--r-- | Source/Modules/java.cxx | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 298056b7b..b6e0006af 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -1878,6 +1878,7 @@ public: String *old_proxy_class_constants_code = proxy_class_constants_code; String *old_proxy_class_def = proxy_class_def; String *old_proxy_class_code = proxy_class_code; + bool has_outerclass = Getattr(n, "nested:outer") && !GetFlag(n, "feature:flatnested"); if (proxy_flag) { proxy_class_name = NewString(Getattr(n, "sym:name")); @@ -1918,8 +1919,8 @@ public: } } - // inner class doesn't need this prologue - if (!Getattr(n, "nested:outer")) { + // Each outer proxy class goes into a separate file + if (!has_outerclass) { String *output_directory = outputDirectory(nspace); String *filen = NewStringf("%s%s.cs", output_directory, proxy_class_name); f_proxy = NewFile(filen, "w", SWIG_output_files()); @@ -1971,7 +1972,6 @@ public: Replaceall(proxy_class_def, "$dllimport", dllimport); Replaceall(proxy_class_code, "$dllimport", dllimport); Replaceall(proxy_class_constants_code, "$dllimport", dllimport); - bool has_outerclass = Getattr(n, "nested:outer") != 0 && !GetFlag(n, "feature:flatnested"); if (!has_outerclass) Printv(f_proxy, proxy_class_def, proxy_class_code, NIL); else { diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 601cbb20e..e8dafbc3f 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -1945,6 +1945,8 @@ public: String *old_proxy_class_constants_code = proxy_class_constants_code; String *old_proxy_class_def = proxy_class_def; String *old_proxy_class_code = proxy_class_code; + bool has_outerclass = Getattr(n, "nested:outer") && !GetFlag(n, "feature:flatnested"); + if (proxy_flag) { proxy_class_name = NewString(Getattr(n, "sym:name")); String *nspace = getNSpace(); @@ -1997,7 +1999,8 @@ public: return SWIG_ERROR; } - if (!Getattr(n, "nested:outer")) { + // Each outer proxy class goes into a separate file + if (!has_outerclass) { String *output_directory = outputDirectory(nspace); String *filen = NewStringf("%s%s.java", output_directory, proxy_class_name); f_proxy = NewFile(filen, "w", SWIG_output_files()); @@ -2054,7 +2057,6 @@ public: Replaceall(proxy_class_code, "$imclassname", full_imclass_name); Replaceall(proxy_class_constants_code, "$imclassname", full_imclass_name); - bool has_outerclass = Getattr(n, "nested:outer") != 0 && !GetFlag(n, "feature:flatnested"); if (!has_outerclass) Printv(f_proxy, proxy_class_def, proxy_class_code, NIL); else { |