Changeset 6500 for trunk/psLib/src/sys/psMemory.c
- Timestamp:
- Feb 27, 2006, 4:53:03 PM (20 years ago)
- File:
-
- 1 edited
-
trunk/psLib/src/sys/psMemory.c (modified) (26 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/sys/psMemory.c
r6425 r6500 8 8 * @author Robert Lupton, Princeton University 9 9 * 10 * @version $Revision: 1. 69$ $Name: not supported by cvs2svn $11 * @date $Date: 2006-02- 14 00:09:27$10 * @version $Revision: 1.70 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2006-02-28 02:53:03 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 828 828 return true; 829 829 else { 830 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 830 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 831 "Incorrect pointer. Datatypes do not match.\n"); 831 832 break; 832 833 } … … 835 836 return true; 836 837 else { 837 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 838 break; 839 } 840 /* case PS_DATA_CELL: 841 if ( psMemCheckCell(ptr) ) 842 return true; 843 else 844 { 845 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 846 break; 847 } 848 case PS_DATA_CHIP: 849 if ( psMemCheckChip(ptr) ) 850 return true; 851 else 852 { 853 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 854 break; 855 } 856 */ 838 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 839 "Incorrect pointer. Datatypes do not match.\n"); 840 break; 841 } 857 842 case PS_DATA_CUBE: 858 843 if ( psMemCheckCube(ptr) ) 859 844 return true; 860 845 else { 861 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 862 break; 863 } 864 865 846 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 847 "Incorrect pointer. Datatypes do not match.\n"); 848 break; 849 } 866 850 case PS_DATA_FITS: 867 851 if ( psMemCheckFits(ptr) ) 868 852 return true; 869 853 else { 870 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n");871 break;872 }873 854 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 855 "Incorrect pointer. Datatypes do not match.\n"); 856 break; 857 } 874 858 case PS_DATA_HASH: 875 859 if ( psMemCheckHash(ptr) ) 876 860 return true; 877 861 else { 878 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 862 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 863 "Incorrect pointer. Datatypes do not match.\n"); 879 864 break; 880 865 } … … 883 868 return true; 884 869 else { 885 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 870 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 871 "Incorrect pointer. Datatypes do not match.\n"); 886 872 break; 887 873 } … … 890 876 return true; 891 877 else { 892 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 878 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 879 "Incorrect pointer. Datatypes do not match.\n"); 893 880 break; 894 881 } … … 897 884 return true; 898 885 else { 899 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 886 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 887 "Incorrect pointer. Datatypes do not match.\n"); 900 888 break; 901 889 } … … 904 892 return true; 905 893 else { 906 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 894 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 895 "Incorrect pointer. Datatypes do not match.\n"); 907 896 break; 908 897 } … … 911 900 return true; 912 901 else { 913 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 902 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 903 "Incorrect pointer. Datatypes do not match.\n"); 914 904 break; 915 905 } … … 918 908 return true; 919 909 else { 920 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 910 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 911 "Incorrect pointer. Datatypes do not match.\n"); 921 912 break; 922 913 } … … 925 916 return true; 926 917 else { 927 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 918 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 919 "Incorrect pointer. Datatypes do not match.\n"); 928 920 break; 929 921 } … … 932 924 return true; 933 925 else { 934 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 926 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 927 "Incorrect pointer. Datatypes do not match.\n"); 935 928 break; 936 929 } … … 939 932 return true; 940 933 else { 941 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 934 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 935 "Incorrect pointer. Datatypes do not match.\n"); 942 936 break; 943 937 } … … 946 940 return true; 947 941 else { 948 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 942 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 943 "Incorrect pointer. Datatypes do not match.\n"); 949 944 break; 950 945 } … … 953 948 return true; 954 949 else { 955 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 950 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 951 "Incorrect pointer. Datatypes do not match.\n"); 956 952 break; 957 953 } … … 960 956 return true; 961 957 else { 962 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 958 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 959 "Incorrect pointer. Datatypes do not match.\n"); 963 960 break; 964 961 } … … 967 964 return true; 968 965 else { 969 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 966 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 967 "Incorrect pointer. Datatypes do not match.\n"); 970 968 break; 971 969 } … … 974 972 return true; 975 973 else { 976 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 974 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 975 "Incorrect pointer. Datatypes do not match.\n"); 977 976 break; 978 977 } … … 981 980 return true; 982 981 else { 983 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 982 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 983 "Incorrect pointer. Datatypes do not match.\n"); 984 984 break; 985 985 } … … 988 988 return true; 989 989 else { 990 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 990 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 991 "Incorrect pointer. Datatypes do not match.\n"); 991 992 break; 992 993 } … … 995 996 return true; 996 997 else { 997 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 998 break; 999 } 1000 1001 /* case PS_DATA_READOUT: 1002 if ( psMemCheckReadout(ptr) ) 1003 return true; 1004 else 1005 { 1006 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 1007 break; 1008 } 1009 1010 *//* case PS_DATA_REGION: 1011 if ( psMemCheckRegion(ptr) ) 1012 return true; 1013 else 1014 { 1015 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 1016 break; 1017 } 1018 */ 998 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 999 "Incorrect pointer. Datatypes do not match.\n"); 1000 break; 1001 } 1019 1002 case PS_DATA_SCALAR: 1020 1003 if ( psMemCheckScalar(ptr) ) 1021 1004 return true; 1022 1005 else { 1023 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 1006 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 1007 "Incorrect pointer. Datatypes do not match.\n"); 1024 1008 break; 1025 1009 } … … 1028 1012 return true; 1029 1013 else { 1030 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 1014 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 1015 "Incorrect pointer. Datatypes do not match.\n"); 1031 1016 break; 1032 1017 } … … 1035 1020 return true; 1036 1021 else { 1037 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 1022 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 1023 "Incorrect pointer. Datatypes do not match.\n"); 1038 1024 break; 1039 1025 } … … 1042 1028 return true; 1043 1029 else { 1044 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 1030 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 1031 "Incorrect pointer. Datatypes do not match.\n"); 1045 1032 break; 1046 1033 } … … 1049 1036 return true; 1050 1037 else { 1051 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 1038 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 1039 "Incorrect pointer. Datatypes do not match.\n"); 1052 1040 break; 1053 1041 } … … 1056 1044 return true; 1057 1045 else { 1058 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 1046 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 1047 "Incorrect pointer. Datatypes do not match.\n"); 1059 1048 break; 1060 1049 } … … 1063 1052 return true; 1064 1053 else { 1065 psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Incorrect pointer. Datatypes do not match.\n"); 1054 psError(PS_ERR_BAD_PARAMETER_VALUE, false, 1055 "Incorrect pointer. Datatypes do not match.\n"); 1066 1056 break; 1067 1057 } 1068 1058 default: 1069 psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Invalid datatype specified.\n"); 1059 psError(PS_ERR_BAD_PARAMETER_TYPE, true, 1060 "Invalid datatype specified.\n"); 1070 1061 } 1071 1062 return false;
Note:
See TracChangeset
for help on using the changeset viewer.
