C++: Replace hasQualifiedName by hasGlobalName in docs examples

jketema · jketema · commit fe5fbaa142a1 · 2023-03-03T15:08:00.000+01:00
diff --git a/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/exercise4.ql b/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/exercise4.ql
@@ -2,7 +2,7 @@ import cpp
 import semmle.code.cpp.dataflow.new.DataFlow
 
 class GetenvSource extends DataFlow::Node {
-  GetenvSource() { this.asIndirectExpr(1).(FunctionCall).getTarget().hasQualifiedName("getenv") }
+  GetenvSource() { this.asIndirectExpr(1).(FunctionCall).getTarget().hasGlobalName("getenv") }
 }
 
 class GetenvToGethostbynameConfiguration extends DataFlow::Configuration {
diff --git a/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/fopen-flow-from-expr.ql b/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/fopen-flow-from-expr.ql
@@ -3,7 +3,7 @@ import semmle.code.cpp.dataflow.new.DataFlow
 
 from Function fopen, FunctionCall fc, Expr src, DataFlow::Node source, DataFlow::Node sink
 where
-  fopen.hasQualifiedName("fopen") and
+  fopen.hasGlobalName("fopen") and
   fc.getTarget() = fopen and
   source.asIndirectExpr(1) = src and
   sink.asIndirectExpr(1) = fc.getArgument(0) and
diff --git a/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/fopen-flow-from-getenv.ql b/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/fopen-flow-from-getenv.ql
@@ -7,14 +7,14 @@ class EnvironmentToFileConfiguration extends DataFlow::Configuration {
   override predicate isSource(DataFlow::Node source) {
     exists(Function getenv |
       source.asIndirectExpr(1).(FunctionCall).getTarget() = getenv and
-      getenv.hasQualifiedName("getenv")
+      getenv.hasGlobalName("getenv")
     )
   }
 
   override predicate isSink(DataFlow::Node sink) {
     exists(FunctionCall fc |
       sink.asIndirectExpr(1) = fc.getArgument(0) and
-      fc.getTarget().hasQualifiedName("fopen")
+      fc.getTarget().hasGlobalName("fopen")
     )
   }
 }
diff --git a/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/fopen-flow-from-param.ql b/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/fopen-flow-from-param.ql
@@ -3,7 +3,7 @@ import semmle.code.cpp.dataflow.new.DataFlow
 
 from Function fopen, FunctionCall fc, Parameter p, DataFlow::Node source, DataFlow::Node sink
 where
-  fopen.hasQualifiedName("fopen") and
+  fopen.hasGlobalName("fopen") and
   fc.getTarget() = fopen and
   source.asParameter(1) = p and
   sink.asIndirectExpr(1) = fc.getArgument(0) and
diff --git a/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/fopen-no-flow.ql b/cpp/ql/test/examples/docs-examples/analyzing-data-flow-in-cpp/fopen-no-flow.ql
@@ -2,6 +2,6 @@ import cpp
 
 from Function fopen, FunctionCall fc
 where
-  fopen.hasQualifiedName("fopen") and
+  fopen.hasGlobalName("fopen") and
   fc.getTarget() = fopen
 select fc.getArgument(0)
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp-new.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp-new.rst
@@ -97,7 +97,7 @@ The following query finds the filename passed to ``fopen``.
 
    from Function fopen, FunctionCall fc
    where
-     fopen.hasQualifiedName("fopen") and
+     fopen.hasGlobalName("fopen") and
      fc.getTarget() = fopen
    select fc.getArgument(0)
 
@@ -110,7 +110,7 @@ Unfortunately, this will only give the expression in the argument, not the value
 
    from Function fopen, FunctionCall fc, Expr src, DataFlow::Node source, DataFlow::Node sink
    where
-     fopen.hasQualifiedName("fopen") and
+     fopen.hasGlobalName("fopen") and
      fc.getTarget() = fopen and
      source.asIndirectExpr(1) = src and
      sink.asIndirectExpr(1) = fc.getArgument(0) and
@@ -126,7 +126,7 @@ Then we can vary the source and, for example, use the parameter of a function. T
 
    from Function fopen, FunctionCall fc, Parameter p, DataFlow::Node source, DataFlow::Node sink
    where
-     fopen.hasQualifiedName("fopen") and
+     fopen.hasGlobalName("fopen") and
      fc.getTarget() = fopen and
      source.asParameter(1) = p and
      sink.asIndirectExpr(1) = fc.getArgument(0) and
@@ -253,14 +253,14 @@ The following data flow configuration tracks data flow from environment variable
      override predicate isSource(DataFlow::Node source) {
        exists(Function getenv |
          source.asIndirectExpr(1).(FunctionCall).getTarget() = getenv and
-         getenv.hasQualifiedName("getenv")
+         getenv.hasGlobalName("getenv")
        )
      }
 
      override predicate isSink(DataFlow::Node sink) {
        exists(FunctionCall fc |
          sink.asIndirectExpr(1) = fc.getArgument(0) and
-         fc.getTarget().hasQualifiedName("fopen")
+         fc.getTarget().hasGlobalName("fopen")
        )
      }
    }
@@ -386,7 +386,7 @@ Exercise 3
    import semmle.code.cpp.dataflow.new.DataFlow
 
    class GetenvSource extends DataFlow::Node {
-     GetenvSource() { this.asIndirectExpr(1).(FunctionCall).getTarget().hasQualifiedName("getenv") }
+     GetenvSource() { this.asIndirectExpr(1).(FunctionCall).getTarget().hasGlobalName("getenv") }
    }
 
 Exercise 4
@@ -398,7 +398,7 @@ Exercise 4
    import semmle.code.cpp.dataflow.new.DataFlow
 
    class GetenvSource extends DataFlow::Node {
-     GetenvSource() { this.asIndirectExpr(1).(FunctionCall).getTarget().hasQualifiedName("getenv") }
+     GetenvSource() { this.asIndirectExpr(1).(FunctionCall).getTarget().hasGlobalName("getenv") }
    }
 
    class GetenvToGethostbynameConfiguration extends DataFlow::Configuration {
diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-cpp.rst
@@ -88,7 +88,7 @@ The following query finds the filename passed to ``fopen``.
    import cpp
 
    from Function fopen, FunctionCall fc
-   where fopen.hasQualifiedName("fopen")
+   where fopen.hasGlobalName("fopen")
      and fc.getTarget() = fopen
    select fc.getArgument(0)
 
@@ -100,7 +100,7 @@ Unfortunately, this will only give the expression in the argument, not the value
    import semmle.code.cpp.dataflow.DataFlow
 
    from Function fopen, FunctionCall fc, Expr src
-   where fopen.hasQualifiedName("fopen")
+   where fopen.hasGlobalName("fopen")
      and fc.getTarget() = fopen
      and DataFlow::localFlow(DataFlow::exprNode(src), DataFlow::exprNode(fc.getArgument(0)))
    select src
@@ -113,7 +113,7 @@ Then we can vary the source and, for example, use the parameter of a function. T
    import semmle.code.cpp.dataflow.DataFlow
 
    from Function fopen, FunctionCall fc, Parameter p
-   where fopen.hasQualifiedName("fopen")
+   where fopen.hasGlobalName("fopen")
      and fc.getTarget() = fopen
      and DataFlow::localFlow(DataFlow::parameterNode(p), DataFlow::exprNode(fc.getArgument(0)))
    select p
@@ -236,14 +236,14 @@ The following data flow configuration tracks data flow from environment variable
      override predicate isSource(DataFlow::Node source) {
        exists (Function getenv |
          source.asExpr().(FunctionCall).getTarget() = getenv and
-         getenv.hasQualifiedName("getenv")
+         getenv.hasGlobalName("getenv")
        )
      }
 
      override predicate isSink(DataFlow::Node sink) {
        exists (FunctionCall fc |
          sink.asExpr() = fc.getArgument(0) and
-         fc.getTarget().hasQualifiedName("fopen")
+         fc.getTarget().hasGlobalName("fopen")
        )
      }
    }
@@ -356,7 +356,7 @@ Exercise 3
 
    class GetenvSource extends FunctionCall {
      GetenvSource() {
-       this.getTarget().hasQualifiedName("getenv")
+       this.getTarget().hasGlobalName("getenv")
      }
    }
 
@@ -369,7 +369,7 @@ Exercise 4
 
    class GetenvSource extends DataFlow::Node {
      GetenvSource() {
-       this.asExpr().(FunctionCall).getTarget().hasQualifiedName("getenv")
+       this.asExpr().(FunctionCall).getTarget().hasGlobalName("getenv")
      }
    }
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import cpp`
`2`	`2`	`import semmle.code.cpp.dataflow.new.DataFlow`
`3`	`3`
`4`	`4`	`class GetenvSource extends DataFlow::Node {`
`5`		`- GetenvSource() { this.asIndirectExpr(1).(FunctionCall).getTarget().hasQualifiedName("getenv") }`
	`5`	`+ GetenvSource() { this.asIndirectExpr(1).(FunctionCall).getTarget().hasGlobalName("getenv") }`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`class GetenvToGethostbynameConfiguration extends DataFlow::Configuration {`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@ class EnvironmentToFileConfiguration extends DataFlow::Configuration {`
`7`	`7`	`override predicate isSource(DataFlow::Node source) {`
`8`	`8`	`exists(Function getenv \|`
`9`	`9`	`source.asIndirectExpr(1).(FunctionCall).getTarget() = getenv and`
`10`		`- getenv.hasQualifiedName("getenv")`
	`10`	`+ getenv.hasGlobalName("getenv")`
`11`	`11`	`)`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`override predicate isSink(DataFlow::Node sink) {`
`15`	`15`	`exists(FunctionCall fc \|`
`16`	`16`	`sink.asIndirectExpr(1) = fc.getArgument(0) and`
`17`		`- fc.getTarget().hasQualifiedName("fopen")`
	`17`	`+ fc.getTarget().hasGlobalName("fopen")`
`18`	`18`	`)`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
@@ -88,7 +88,7 @@ The following query finds the filename passed to ``fopen``.
`88`	`88`	`import cpp`
`89`	`89`
`90`	`90`	`from Function fopen, FunctionCall fc`
`91`		`- where fopen.hasQualifiedName("fopen")`
	`91`	`+ where fopen.hasGlobalName("fopen")`
`92`	`92`	`and fc.getTarget() = fopen`
`93`	`93`	`select fc.getArgument(0)`
`94`	`94`
`@@ -100,7 +100,7 @@ Unfortunately, this will only give the expression in the argument, not the value`
`100`	`100`	`import semmle.code.cpp.dataflow.DataFlow`
`101`	`101`
`102`	`102`	`from Function fopen, FunctionCall fc, Expr src`
`103`		`- where fopen.hasQualifiedName("fopen")`
	`103`	`+ where fopen.hasGlobalName("fopen")`
`104`	`104`	`and fc.getTarget() = fopen`
`105`	`105`	`and DataFlow::localFlow(DataFlow::exprNode(src), DataFlow::exprNode(fc.getArgument(0)))`
`106`	`106`	`select src`
`@@ -113,7 +113,7 @@ Then we can vary the source and, for example, use the parameter of a function. T`
`113`	`113`	`import semmle.code.cpp.dataflow.DataFlow`
`114`	`114`
`115`	`115`	`from Function fopen, FunctionCall fc, Parameter p`
`116`		`- where fopen.hasQualifiedName("fopen")`
	`116`	`+ where fopen.hasGlobalName("fopen")`
`117`	`117`	`and fc.getTarget() = fopen`
`118`	`118`	`and DataFlow::localFlow(DataFlow::parameterNode(p), DataFlow::exprNode(fc.getArgument(0)))`
`119`	`119`	`select p`
`@@ -236,14 +236,14 @@ The following data flow configuration tracks data flow from environment variable`
`236`	`236`	`override predicate isSource(DataFlow::Node source) {`
`237`	`237`	`exists (Function getenv \|`
`238`	`238`	`source.asExpr().(FunctionCall).getTarget() = getenv and`
`239`		`- getenv.hasQualifiedName("getenv")`
	`239`	`+ getenv.hasGlobalName("getenv")`
`240`	`240`	`)`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`override predicate isSink(DataFlow::Node sink) {`
`244`	`244`	`exists (FunctionCall fc \|`
`245`	`245`	`sink.asExpr() = fc.getArgument(0) and`
`246`		`- fc.getTarget().hasQualifiedName("fopen")`
	`246`	`+ fc.getTarget().hasGlobalName("fopen")`
`247`	`247`	`)`
`248`	`248`	`}`
`249`	`249`	`}`
`@@ -356,7 +356,7 @@ Exercise 3`
`356`	`356`
`357`	`357`	`class GetenvSource extends FunctionCall {`
`358`	`358`	`GetenvSource() {`
`359`		`- this.getTarget().hasQualifiedName("getenv")`
	`359`	`+ this.getTarget().hasGlobalName("getenv")`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`
`@@ -369,7 +369,7 @@ Exercise 4`
`369`	`369`
`370`	`370`	`class GetenvSource extends DataFlow::Node {`
`371`	`371`	`GetenvSource() {`
`372`		`- this.asExpr().(FunctionCall).getTarget().hasQualifiedName("getenv")`
	`372`	`+ this.asExpr().(FunctionCall).getTarget().hasGlobalName("getenv")`
`373`	`373`	`}`
`374`	`374`	`}`
`375`	`375`