Changeset 6141 for trunk/AISC_COM/C/server.c
- Timestamp:
- 14/08/09 16:29:27 (3 years ago)
- Files:
-
- 1 modified
-
trunk/AISC_COM/C/server.c (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/AISC_COM/C/server.c
r5630 r6141 86 86 87 87 extern char *aisc_object_names[]; 88 extern char **aisc_attribut _names_list[];88 extern char **aisc_attribute_names_list[]; 89 89 90 90 extern aisc_talking_func_long *aisc_talking_functions_get[]; … … 238 238 const char *aisc_get_object_attribute(long i,long j) 239 239 { 240 if ((i<0) || (i>=AISC_MAX_OBJECT) || (!aisc_attribut _names_list[i])) {240 if ((i<0) || (i>=AISC_MAX_OBJECT) || (!aisc_attribute_names_list[i])) { 241 241 return "<null>"; 242 242 } 243 if ((j<0) || (j>=AISC_MAX_ATTR) || (!aisc_attribut _names_list[i][j])){243 if ((j<0) || (j>=AISC_MAX_ATTR) || (!aisc_attribute_names_list[i][j])){ 244 244 return "<unknown attribute>"; 245 245 } 246 return aisc_attribut _names_list[i][j];246 return aisc_attribute_names_list[i][j]; 247 247 } 248 248 … … 269 269 if (!strcmp(path,":")) { 270 270 path = (char *)getenv("SOCKET"); 271 if (!path) return " ENVIROMENT SOCKET NOT FOUNT";271 if (!path) return "environment socket not found"; 272 272 } 273 273 p = (char *) strchr(path, ':'); … … 514 514 function = functions[attribute]; 515 515 if (!function) { 516 sprintf(error_buf, "DON T KNOW ATTRIBUTE %li",516 sprintf(error_buf, "DON'T KNOW ATTRIBUTE %li", 517 517 attribute); 518 518 aisc_server_error = error_buf; … … 656 656 type = code &0xff000000; 657 657 if (attribute > AISC_MAX_ATTR) { 658 sprintf(error_buf,"ATTRIBUTE %li DOESN T EXIST",658 sprintf(error_buf,"ATTRIBUTE %li DOESN'T EXIST", 659 659 attribute); 660 660 aisc_server_error = error_buf; … … 668 668 } 669 669 if (!function){ 670 sprintf(error_buf,"ATTRIBUTE %li DOESN T EXIST",670 sprintf(error_buf,"ATTRIBUTE %li DOESN'T EXIST", 671 671 attribute); 672 672 aisc_server_error = error_buf; … … 825 825 object_type = in_buf[in_pos++]; 826 826 if (!functions) { 827 sprintf(error_buf, "AISC_CREATE_SERVER_ERROR: FATHER %s DOESN T HAVE TARGET-ATTRIBUTE %s",827 sprintf(error_buf, "AISC_CREATE_SERVER_ERROR: FATHER %s DOESN'T HAVE TARGET-ATTRIBUTE %s", 828 828 aisc_get_object_names(father_type), aisc_get_object_attribute(father_type,attribute)); 829 829 aisc_server_error = error_buf; … … 836 836 function = functions[attribute]; 837 837 if (!function) { 838 sprintf(error_buf, "AISC_CREATE_SERVER_ERROR: FATHER %s FATHER DOESN T HAVE TARGET-ATTRIBUTE %s",838 sprintf(error_buf, "AISC_CREATE_SERVER_ERROR: FATHER %s FATHER DOESN'T HAVE TARGET-ATTRIBUTE %s", 839 839 aisc_get_object_names(father_type), aisc_get_object_attribute(father_type,attribute)); 840 840 aisc_server_error = error_buf; … … 891 891 type = code & 0xff000000; 892 892 if (!functions) { 893 aisc_server_error = "AISC_COPY_SERVER_ERROR: FATHER DOESN T HAVE TARGET-ATTRIBUTES";893 aisc_server_error = "AISC_COPY_SERVER_ERROR: FATHER DOESN'T HAVE TARGET-ATTRIBUTES"; 894 894 break; 895 895 } … … 900 900 function = functions[attribute]; 901 901 if (!function) { 902 sprintf(error_buf, "AISC_COPY_SERVER_ERROR: FATHER %s DOESN T HAVE TARGET-ATTRIBUTE %s",902 sprintf(error_buf, "AISC_COPY_SERVER_ERROR: FATHER %s DOESN'T HAVE TARGET-ATTRIBUTE %s", 903 903 aisc_get_object_names(father_type), aisc_get_object_attribute(father_type,attribute)); 904 904 aisc_server_error = error_buf; … … 958 958 type = code & 0xff000000; 959 959 if (!functions) { 960 aisc_server_error = "AISC_FIND_SERVER_ERROR: FATHER DON T KNOW ATTRIBUTES FOR SEARCH";960 aisc_server_error = "AISC_FIND_SERVER_ERROR: FATHER DON'T KNOW ATTRIBUTES FOR SEARCH"; 961 961 break; 962 962 } … … 967 967 function = functions[attribute]; 968 968 if (!function) { 969 sprintf(error_buf, "AISC_FIND_SERVER_ERROR: FATHER %s DON T KNOW ATTRIBUTE %s FOR SEARCH",969 sprintf(error_buf, "AISC_FIND_SERVER_ERROR: FATHER %s DON'T KNOW ATTRIBUTE %s FOR SEARCH", 970 970 aisc_get_object_names(father_type), aisc_get_object_attribute(father_type,attribute)); 971 971 aisc_server_error = error_buf; … … 1318 1318 return hs; 1319 1319 } 1320 /*** an event has occur ed! ***/1320 /*** an event has occurred! ***/ 1321 1321 if( (timeout.tv_usec>=0)&&(timeout.tv_usec<100000)) timeout.tv_usec = 100000; 1322 1322
