[???] Use std:: when calling strcmp

Author: SwooshyCueb

include/irods/private/re/python.hpp

@@ -1,6 +1,7 @@
 #ifndef IRODS_RE_PYTHON_HPP
 #define IRODS_RE_PYTHON_HPP
 
+#include <cstring>
 #include <type_traits>
 #include <functional>
 
@@ -109,28 +110,28 @@ namespace
 		else if (!msParam.type) {
 			THROW(SYS_NOT_SUPPORTED, "msParam type is null");
 		}
-		else if (strcmp(msParam.type, GenQueryInp_MS_T) == 0) {
+		else if (std::strcmp(msParam.type, GenQueryInp_MS_T) == 0) {
 			return boost::python::object{*static_cast<genQueryInp_t*>(msParam.inOutStruct)};
 		}
-		else if (strcmp(msParam.type, GenQueryOut_MS_T) == 0) {
+		else if (std::strcmp(msParam.type, GenQueryOut_MS_T) == 0) {
 			return boost::python::object{*static_cast<genQueryOut_t*>(msParam.inOutStruct)};
 		}
-		else if (strcmp(msParam.type, KeyValPair_MS_T) == 0) {
+		else if (std::strcmp(msParam.type, KeyValPair_MS_T) == 0) {
 			return boost::python::object{*static_cast<keyValPair_t*>(msParam.inOutStruct)};
 		}
-		else if (strcmp(msParam.type, DataObjLseekOut_MS_T) == 0) {
+		else if (std::strcmp(msParam.type, DataObjLseekOut_MS_T) == 0) {
 			return boost::python::object{*static_cast<fileLseekOut_t*>(msParam.inOutStruct)};
 		}
-		else if (strcmp(msParam.type, RodsObjStat_MS_T) == 0) {
+		else if (std::strcmp(msParam.type, RodsObjStat_MS_T) == 0) {
 			return boost::python::object{*static_cast<rodsObjStat_t*>(msParam.inOutStruct)};
 		}
-		else if (strcmp(msParam.type, INT_MS_T) == 0) {
+		else if (std::strcmp(msParam.type, INT_MS_T) == 0) {
 			return boost::python::object{*static_cast<int*>(msParam.inOutStruct)};
 		}
-		else if (strcmp(msParam.type, FLOAT_MS_T) == 0) {
+		else if (std::strcmp(msParam.type, FLOAT_MS_T) == 0) {
 			return boost::python::object{*static_cast<float*>(msParam.inOutStruct)};
 		}
-		else if (strcmp(msParam.type, BUF_LEN_MS_T) == 0) {
+		else if (std::strcmp(msParam.type, BUF_LEN_MS_T) == 0) {
 			// clang-format off
 			return msParam.inpOutBuf
 			     ? boost::python::object{bytesBuf_t{msParam.inpOutBuf->len, msParam.inpOutBuf->buf}}

src/main.cpp

@@ -2,6 +2,7 @@
 #include <pyconfig.h>
 
 #include <cstdint>
+#include <cstring>
 #include <ctime>
 #include <fstream>
 #include <list>
@@ -750,20 +751,20 @@ static irods::error exec_rule_text(const irods::default_re_ctx&,
 				if (mp->type == NULL) {
 					rule_vars_python[label] = NULL;
 				}
-				else if (strcmp(mp->type, DOUBLE_MS_T) == 0) {
+				else if (std::strcmp(mp->type, DOUBLE_MS_T) == 0) {
 					double* tmpDouble = (double*) mp->inOutStruct;
 					rule_vars_python[label] = tmpDouble;
 				}
-				else if (strcmp(mp->type, INT_MS_T) == 0) {
+				else if (std::strcmp(mp->type, INT_MS_T) == 0) {
 					int* tmpInt = (int*) mp->inOutStruct;
 					rule_vars_python[label] = tmpInt;
 				}
-				else if (strcmp(mp->type, STR_MS_T) == 0) {
+				else if (std::strcmp(mp->type, STR_MS_T) == 0) {
 					char* tmpChar = (char*) mp->inOutStruct;
 					std::string tmpStr(tmpChar);
 					rule_vars_python[label] = tmpStr;
 				}
-				else if (strcmp(mp->type, DATETIME_MS_T) == 0) {
+				else if (std::strcmp(mp->type, DATETIME_MS_T) == 0) {
 					rodsLong_t* tmpRodsLong = (rodsLong_t*) mp->inOutStruct;
 					rule_vars_python[label] = tmpRodsLong;
 				}
@@ -899,20 +900,20 @@ static irods::error exec_rule_expression(irods::default_re_ctx&,
 						if (mp->type == NULL) {
 							rule_vars_python[label] = boost::python::object{};
 						}
-						else if (strcmp(mp->type, DOUBLE_MS_T) == 0) {
+						else if (std::strcmp(mp->type, DOUBLE_MS_T) == 0) {
 							double* tmpDouble = (double*) mp->inOutStruct;
 							rule_vars_python[label] = tmpDouble;
 						}
-						else if (strcmp(mp->type, INT_MS_T) == 0) {
+						else if (std::strcmp(mp->type, INT_MS_T) == 0) {
 							int* tmpInt = (int*) mp->inOutStruct;
 							rule_vars_python[label] = tmpInt;
 						}
-						else if (strcmp(mp->type, STR_MS_T) == 0) {
+						else if (std::strcmp(mp->type, STR_MS_T) == 0) {
 							char* tmpChar = (char*) mp->inOutStruct;
 							std::string tmpStr(tmpChar);
 							rule_vars_python[label] = tmpStr;
 						}
-						else if (strcmp(mp->type, DATETIME_MS_T) == 0) {
+						else if (std::strcmp(mp->type, DATETIME_MS_T) == 0) {
 							rodsLong_t* tmpRodsLong = (rodsLong_t*) mp->inOutStruct;
 							rule_vars_python[label] = tmpRodsLong;
 						}

src/types/irods/objInfo.cpp

@@ -3,6 +3,8 @@
 
 #include "irods/private/re/python/types/irods/objInfo.hpp"
 
+#include <cstring>
+
 #include <irods/objInfo.h>
 
 #include "irods/private/re/python/types/array_ref.hpp"
@@ -92,7 +94,7 @@ namespace irods::re::python::types
 			.add_property("value", +[](keyValPair_t *s) { return array_ref<array_ref<char, true>>{s->value, static_cast<std::size_t>(s->len)}; })
 			.def("__getitem__", +[](keyValPair_t* s, const std::string key) {
 					for (int i = 0; i < s->len; ++i) {
-						if (strcmp(key.c_str(), s->keyWord[i]) == 0) {
+						if (std::strcmp(key.c_str(), s->keyWord[i]) == 0) {
 							return std::string{s->value[i]};
 						}
 					}