C#: Get rid of TaintTrackingUtil.qll

jbj · jbj · commit 7c4938c035c6 · 2019-08-20T13:56:13.000+02:00
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/TaintTrackingUtil.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/TaintTrackingUtil.qll
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
@@ -1,5 +1,6 @@
-import semmle.code.csharp.dataflow.internal.TaintTrackingUtil as Public
+import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public
 
 module Private {
   import semmle.code.csharp.dataflow.DataFlow::DataFlow as DataFlow
+  import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
 }
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingParameter.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
@@ -1,5 +1,6 @@
-import semmle.code.csharp.dataflow.internal.TaintTrackingUtil as Public
+import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public
 
 module Private {
   import semmle.code.csharp.dataflow.DataFlow2::DataFlow2 as DataFlow
+  import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
 }
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingParameter.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingParameter.qll
@@ -1,5 +1,6 @@
-import semmle.code.csharp.dataflow.internal.TaintTrackingUtil as Public
+import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public
 
 module Private {
   import semmle.code.csharp.dataflow.DataFlow3::DataFlow3 as DataFlow
+  import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
 }
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingParameter.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingParameter.qll
@@ -1,5 +1,6 @@
-import semmle.code.csharp.dataflow.internal.TaintTrackingUtil as Public
+import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public
 
 module Private {
   import semmle.code.csharp.dataflow.DataFlow4::DataFlow4 as DataFlow
+  import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
 }
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingParameter.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingParameter.qll
@@ -1,5 +1,6 @@
-import semmle.code.csharp.dataflow.internal.TaintTrackingUtil as Public
+import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public
 
 module Private {
   import semmle.code.csharp.dataflow.DataFlow5::DataFlow5 as DataFlow
+  import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`		`-import semmle.code.csharp.dataflow.internal.TaintTrackingUtil as Public`
	`1`	`+import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public`
`2`	`2`
`3`	`3`	`module Private {`
`4`	`4`	`import semmle.code.csharp.dataflow.DataFlow::DataFlow as DataFlow`
	`5`	`+ import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate`
`5`	`6`	`}`