comparison src/lread.c @ 40656:cdfd4d09b79a

Update usage of CHECK_ macros (remove unused second argument).
author Pavel Jan?k <Pavel@Janik.cz>
date Fri, 02 Nov 2001 20:46:55 +0000
parents 0f4185c9842a
children ba7239b8872e
comparison
equal deleted inserted replaced
40655:45453187feeb 40656:cdfd4d09b79a
642 char *fmode = "r"; 642 char *fmode = "r";
643 #ifdef DOS_NT 643 #ifdef DOS_NT
644 fmode = "rt"; 644 fmode = "rt";
645 #endif /* DOS_NT */ 645 #endif /* DOS_NT */
646 646
647 CHECK_STRING (file, 0); 647 CHECK_STRING (file);
648 648
649 /* If file name is magic, call the handler. */ 649 /* If file name is magic, call the handler. */
650 /* This shouldn't be necessary any more now that `openp' handles it right. 650 /* This shouldn't be necessary any more now that `openp' handles it right.
651 handler = Ffind_file_name_handler (file, Qload); 651 handler = Ffind_file_name_handler (file, Qload);
652 if (!NILP (handler)) 652 if (!NILP (handler))
964 Lisp_Object string, tail; 964 Lisp_Object string, tail;
965 int max_suffix_len = 0; 965 int max_suffix_len = 0;
966 966
967 for (tail = suffixes; CONSP (tail); tail = XCDR (tail)) 967 for (tail = suffixes; CONSP (tail); tail = XCDR (tail))
968 { 968 {
969 CHECK_STRING (XCAR (tail), 0); 969 CHECK_STRING (XCAR (tail));
970 max_suffix_len = max (max_suffix_len, 970 max_suffix_len = max (max_suffix_len,
971 STRING_BYTES (XSTRING (XCAR (tail)))); 971 STRING_BYTES (XSTRING (XCAR (tail))));
972 } 972 }
973 973
974 string = filename = Qnil; 974 string = filename = Qnil;
1448 Lisp_Object string, start, end; 1448 Lisp_Object string, start, end;
1449 { 1449 {
1450 int startval, endval; 1450 int startval, endval;
1451 Lisp_Object tem; 1451 Lisp_Object tem;
1452 1452
1453 CHECK_STRING (string,0); 1453 CHECK_STRING (string);
1454 1454
1455 if (NILP (end)) 1455 if (NILP (end))
1456 endval = XSTRING (string)->size; 1456 endval = XSTRING (string)->size;
1457 else 1457 else
1458 { 1458 {
1459 CHECK_NUMBER (end, 2); 1459 CHECK_NUMBER (end);
1460 endval = XINT (end); 1460 endval = XINT (end);
1461 if (endval < 0 || endval > XSTRING (string)->size) 1461 if (endval < 0 || endval > XSTRING (string)->size)
1462 args_out_of_range (string, end); 1462 args_out_of_range (string, end);
1463 } 1463 }
1464 1464
1465 if (NILP (start)) 1465 if (NILP (start))
1466 startval = 0; 1466 startval = 0;
1467 else 1467 else
1468 { 1468 {
1469 CHECK_NUMBER (start, 1); 1469 CHECK_NUMBER (start);
1470 startval = XINT (start); 1470 startval = XINT (start);
1471 if (startval < 0 || startval > endval) 1471 if (startval < 0 || startval > endval)
1472 args_out_of_range (string, start); 1472 args_out_of_range (string, start);
1473 } 1473 }
1474 1474
2936 register Lisp_Object tem, sym, *ptr; 2936 register Lisp_Object tem, sym, *ptr;
2937 2937
2938 if (NILP (obarray)) obarray = Vobarray; 2938 if (NILP (obarray)) obarray = Vobarray;
2939 obarray = check_obarray (obarray); 2939 obarray = check_obarray (obarray);
2940 2940
2941 CHECK_STRING (string, 0); 2941 CHECK_STRING (string);
2942 2942
2943 tem = oblookup (obarray, XSTRING (string)->data, 2943 tem = oblookup (obarray, XSTRING (string)->data,
2944 XSTRING (string)->size, 2944 XSTRING (string)->size,
2945 STRING_BYTES (XSTRING (string))); 2945 STRING_BYTES (XSTRING (string)));
2946 if (!INTEGERP (tem)) 2946 if (!INTEGERP (tem))
2986 if (NILP (obarray)) obarray = Vobarray; 2986 if (NILP (obarray)) obarray = Vobarray;
2987 obarray = check_obarray (obarray); 2987 obarray = check_obarray (obarray);
2988 2988
2989 if (!SYMBOLP (name)) 2989 if (!SYMBOLP (name))
2990 { 2990 {
2991 CHECK_STRING (name, 0); 2991 CHECK_STRING (name);
2992 string = XSTRING (name); 2992 string = XSTRING (name);
2993 } 2993 }
2994 else 2994 else
2995 string = XSYMBOL (name)->name; 2995 string = XSYMBOL (name)->name;
2996 2996
3018 3018
3019 if (SYMBOLP (name)) 3019 if (SYMBOLP (name))
3020 XSETSTRING (string, XSYMBOL (name)->name); 3020 XSETSTRING (string, XSYMBOL (name)->name);
3021 else 3021 else
3022 { 3022 {
3023 CHECK_STRING (name, 0); 3023 CHECK_STRING (name);
3024 string = name; 3024 string = name;
3025 } 3025 }
3026 3026
3027 tem = oblookup (obarray, XSTRING (string)->data, 3027 tem = oblookup (obarray, XSTRING (string)->data,
3028 XSTRING (string)->size, 3028 XSTRING (string)->size,
3139 void (*fn) P_ ((Lisp_Object, Lisp_Object)); 3139 void (*fn) P_ ((Lisp_Object, Lisp_Object));
3140 Lisp_Object arg; 3140 Lisp_Object arg;
3141 { 3141 {
3142 register int i; 3142 register int i;
3143 register Lisp_Object tail; 3143 register Lisp_Object tail;
3144 CHECK_VECTOR (obarray, 1); 3144 CHECK_VECTOR (obarray);
3145 for (i = XVECTOR (obarray)->size - 1; i >= 0; i--) 3145 for (i = XVECTOR (obarray)->size - 1; i >= 0; i--)
3146 { 3146 {
3147 tail = XVECTOR (obarray)->contents[i]; 3147 tail = XVECTOR (obarray)->contents[i];
3148 if (SYMBOLP (tail)) 3148 if (SYMBOLP (tail))
3149 while (1) 3149 while (1)