Changeset 15282 for trunk/FACT++/dim/src/diccpp.cxx
- Timestamp:
- 04/08/13 15:07:07 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/dim/src/diccpp.cxx
r14580 r15282 33 33 t->itsDataSize = *size; 34 34 } 35 memcpy(t->itsData, buf, *size);35 memcpy(t->itsData, buf, (size_t)*size); 36 36 } 37 37 else if (*size == 0) … … 83 83 itsDataSize = itsSize; 84 84 } 85 memcpy(itsData, data, itsSize);85 memcpy(itsData, data, (size_t)itsSize); 86 86 } 87 87 } … … 125 125 if(itsFormat) 126 126 { 127 len = strlen(itsFormat)+1;127 len = (int)strlen(itsFormat)+1; 128 128 if(len > 1) 129 129 return itsFormat; 130 130 } 131 131 def = dic_get_format(itsId); 132 new_len = strlen(def)+1;132 new_len = (int)strlen(def)+1; 133 133 if(new_len > len) 134 134 { 135 135 if(itsFormat) 136 136 delete[] itsFormat; 137 itsFormat = new char[ strlen(def)+1];137 itsFormat = new char[(int)strlen(def)+1]; 138 138 } 139 139 strcpy(itsFormat, def); … … 166 166 return; 167 167 } 168 itsName = new char[ strlen(name)+1];168 itsName = new char[(int)strlen(name)+1]; 169 169 strcpy(itsName,name); 170 170 itsNolinkBuf = nolink; … … 174 174 itsNolinkBuf = new char[nolinksize]; 175 175 itsNolinkSize = nolinksize; 176 memcpy(itsNolinkBuf, nolink, nolinksize);176 memcpy(itsNolinkBuf, nolink, (size_t)nolinksize); 177 177 } 178 178 if(!time) … … 253 253 return; 254 254 } 255 itsName = new char[ strlen(name)+1];255 itsName = new char[(int)strlen(name)+1]; 256 256 strcpy(itsName,name); 257 257 itsNolinkBuf = nolink; … … 261 261 itsNolinkBuf = new char[nolinksize]; 262 262 itsNolinkSize = nolinksize; 263 memcpy(itsNolinkBuf, nolink, nolinksize);263 memcpy(itsNolinkBuf, nolink, (size_t)nolinksize); 264 264 } 265 265 if(!time) … … 313 313 return; 314 314 } 315 itsName = new char[ strlen(name)+1];315 itsName = new char[(int)strlen(name)+1]; 316 316 strcpy(itsName,name); 317 317 itsNolinkBuf = nolink; … … 321 321 itsNolinkBuf = new char[nolinksize]; 322 322 itsNolinkSize = nolinksize; 323 memcpy(itsNolinkBuf, nolink, nolinksize);323 memcpy(itsNolinkBuf, nolink, (size_t)nolinksize); 324 324 } 325 325 if(!time) … … 363 363 t->itsDataSize = *size; 364 364 } 365 memcpy(t->itsData, buf, *size);365 memcpy(t->itsData, buf, (size_t)*size); 366 366 } 367 367 else if (*size == 0) … … 404 404 return; 405 405 } 406 itsName = new char[ strlen(name)+1];406 itsName = new char[(int)strlen(name)+1]; 407 407 strcpy(itsName,name); 408 408 itsNolinkBuf = nolink; … … 412 412 itsNolinkBuf = new char[nolinksize]; 413 413 itsNolinkSize = nolinksize; 414 memcpy(itsNolinkBuf, nolink, nolinksize);414 memcpy(itsNolinkBuf, nolink, (size_t)nolinksize); 415 415 } 416 416 if(!time) … … 570 570 { 571 571 if(size > 0) 572 memcpy(t->itsData, buf, size);572 memcpy(t->itsData, buf, (size_t)size); 573 573 else 574 574 t->itsData = buf; … … 633 633 { 634 634 if(size > 0) 635 memcpy(itsData, buf, size);635 memcpy(itsData, buf, (size_t)size); 636 636 else 637 637 itsData = buf; … … 676 676 itsDataSize = itsSize; 677 677 } 678 memcpy(itsData, data, itsSize);678 memcpy(itsData, data, (size_t)itsSize); 679 679 } 680 680 } … … 688 688 itsInit = 0; 689 689 itsWaiting = 0; 690 itsName = new char[ strlen(name)+1];690 itsName = new char[(int)strlen(name)+1]; 691 691 strcpy(itsName,name); 692 692 itsHandler = this; … … 701 701 itsNolinkBuf = new char[nolinksize]; 702 702 itsNolinkSize = nolinksize; 703 memcpy(itsNolinkBuf, nolink, nolinksize);704 } 705 itsNameOut = new char[ strlen(name)+1+10];703 memcpy(itsNolinkBuf, nolink, (size_t)nolinksize); 704 } 705 itsNameOut = new char[(int)strlen(name)+1+10]; 706 706 strcpy(itsNameOut,name); 707 707 strcat(itsNameOut,(char *)"/RpcIn"); 708 itsNameIn = new char[ strlen(name)+1+10];708 itsNameIn = new char[(int)strlen(name)+1+10]; 709 709 strcpy(itsNameIn,name); 710 710 strcat(itsNameIn,(char *)"/RpcOut"); … … 752 752 itsDataOutSize = size; 753 753 } 754 memcpy(itsDataOut, data, size);754 memcpy(itsDataOut, data, (size_t)size); 755 755 } 756 756 else … … 883 883 DimCurrentInfo srv((char *)"DIS_DNS/SERVER_LIST", timeout, (char *)"\0"); 884 884 str = srv.getString(); 885 size = strlen(str)+1;885 size = (int)strlen(str)+1; 886 886 totsize = srv.getSize(); 887 887 … … 894 894 if(totsize > size) 895 895 { 896 pid_str = str + strlen(str) + 1;896 pid_str = str + (int)strlen(str) + 1; 897 897 if(itsData[4]) 898 898 delete itsData[4]; … … 910 910 { 911 911 char *str; 912 char *name = new char[ strlen(serverName) + 20];912 char *name = new char[(int)strlen(serverName) + 20]; 913 913 strcpy(name,(char *)serverName); 914 914 strcat(name,(char *)"/SERVICE_LIST"); … … 933 933 { 934 934 char *str; 935 char *name = new char[ strlen(serverName) + 20];935 char *name = new char[(int)strlen(serverName) + 20]; 936 936 strcpy(name,(char *)serverName); 937 937 strcat(name,(char *)"/CLIENT_LIST"); … … 1129 1129 { 1130 1130 DimCmnd a; 1131 return a.send((char *)name, (char *)data, strlen(data)+1);1131 return a.send((char *)name, (char *)data, (int)strlen(data)+1); 1132 1132 } 1133 1133 … … 1171 1171 { 1172 1172 DimCmnd a; 1173 a.sendNB((char *)name, data, strlen(data)+1);1173 a.sendNB((char *)name, data, (int)strlen(data)+1); 1174 1174 } 1175 1175 … … 1184 1184 DimCmnd a; 1185 1185 int ret, tag = 1; 1186 char *name = new char[ strlen(srvName) + 20];1186 char *name = new char[(int)strlen(srvName) + 20]; 1187 1187 strcpy(name,(char *)srvName); 1188 1188 strcat(name,"/SET_EXIT_HANDLER"); … … 1196 1196 DimCmnd a; 1197 1197 int ret, tag = 1; 1198 char *name = new char[ strlen(srvName) + 20];1198 char *name = new char[(int)strlen(srvName) + 20]; 1199 1199 strcpy(name,(char *)srvName); 1200 1200 strcat(name,"/EXIT");
Note:
See TracChangeset
for help on using the changeset viewer.