luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

oa: replace strcpy() with strcpy_s()

This commit is contained in:
Darryl L. Miles 2024-10-04 20:26:12 +00:00 committed by R. Timothy Edwards
parent e5d6d3f429
commit dfa28d1cd3
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oa/magicInit.cpp
View File

@ -123,7 +123,7 @@ TCLFUNC(get_user_unit) {
TCL_RTN_ERROR("Usage: %s tech",getArgString(0)); TCL_RTN_ERROR("Usage: %s tech",getArgString(0));
try { try {
getUserUnit(getArgString(1), uUnit, NULL, techUserUnit); getUserUnit(getArgString(1), uUnit, sizeof(uUnit), NULL, techUserUnit);
Tcl_Obj *strResult = Tcl_NewStringObj(uUnit, strlen(uUnit)); Tcl_Obj *strResult = Tcl_NewStringObj(uUnit, strlen(uUnit));
//Tcl_SetResult(REX_interp, uUnit, TCL_STATIC); //Tcl_SetResult(REX_interp, uUnit, TCL_STATIC);
Tcl_SetObjResult(REX_interp, strResult); Tcl_SetObjResult(REX_interp, strResult);

18
oa/magicOA.cpp
View File

@ -97,7 +97,7 @@ getTechInfo (const char *techName)
} }
int int
getUserUnit(const char *techName, char *userUnit, ClientData *cdarg, getUserUnit(const char *techName, char *userUnit, size_t userUnitSz, ClientData *cdarg,
int (*magicFunc)(const char *techName, char *userUnit, int (*magicFunc)(const char *techName, char *userUnit,
ClientData *cdarg), oaCellViewType viewType) ClientData *cdarg), oaCellViewType viewType)
{ {
@ -110,35 +110,35 @@ getUserUnit(const char *techName, char *userUnit, ClientData *cdarg,
switch (chipTech->getUserUnits(viewType)) { switch (chipTech->getUserUnits(viewType)) {
case oacMicron: case oacMicron:
//userUnit = "micron"; //userUnit = "micron";
strcpy(userUnit, "micron"); strcpy_s(userUnit, userUnitSz, "micron");
break; break;
case oacMillimeter: case oacMillimeter:
//userUnit = "millimeter"; //userUnit = "millimeter";
strcpy(userUnit, "millimeter"); strcpy_s(userUnit, userUnitSz, "millimeter");
break; break;
case oacCentimeter: case oacCentimeter:
//userUnit = "centimeter"; //userUnit = "centimeter";
strcpy(userUnit, "centimeter"); strcpy_s(userUnit, userUnitSz, "centimeter");
break; break;
case oacMeter: case oacMeter:
//userUnit = "meter"; //userUnit = "meter";
strcpy(userUnit, "meter"); strcpy_s(userUnit, userUnitSz, "meter");
break; break;
case oacMil: case oacMil:
//userUnit = "mil"; //userUnit = "mil";
strcpy(userUnit, "mil"); strcpy_s(userUnit, userUnitSz, "mil");
break; break;
case oacInch: case oacInch:
//userUnit = "inch"; //userUnit = "inch";
strcpy(userUnit, "inch"); strcpy_s(userUnit, userUnitSz, "inch");
break; break;
case oacNanometer: case oacNanometer:
//userUnit = "nanometer"; //userUnit = "nanometer";
strcpy_s(userUnit, userUnitSz, "nanometer");
break; break;
strcpy(userUnit, "nanometer");
default: default:
//userUnit = "none"; //userUnit = "none";
strcpy(userUnit, "none"); strcpy_s(userUnit, userUnitSz, "none");
} }
//cout << "getTechUserUnit " << userUnit << endl; //cout << "getTechUserUnit " << userUnit << endl;
if (magicFunc) if (magicFunc)

2
oa/magicOA.h
View File

@ -6,7 +6,7 @@
// Functions implemented for OA DB access and query // Functions implemented for OA DB access and query
int getTechInfo(const char *techName); int getTechInfo(const char *techName);
int getUserUnit(const char *techName, char *userUnit, ClientData *cdarg, int getUserUnit(const char *techName, char *userUnit, size_t userUnitSz, ClientData *cdarg,
int (*magicFunc) (const char *techName, char *userUnit, int (*magicFunc) (const char *techName, char *userUnit,
ClientData *cdarg) = NULL, ClientData *cdarg) = NULL,
oaCellViewType viewType=oacMaskLayout); oaCellViewType viewType=oacMaskLayout);