comparison src/category.c @ 46370:40db0673e6f0

Most uses of XSTRING combined with STRING_BYTES or indirection changed to SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references left unchanged for now.
author Ken Raeburn <raeburn@raeburn.org>
date Mon, 15 Jul 2002 00:00:41 +0000
parents 604a5f86840f
children 23a1cea22d13
comparison
equal deleted inserted replaced
46369:dd1d3b1d0053 46370:40db0673e6f0
67 val = MAKE_CATEGORY_SET; 67 val = MAKE_CATEGORY_SET;
68 68
69 if (STRING_MULTIBYTE (categories)) 69 if (STRING_MULTIBYTE (categories))
70 error ("Multibyte string in make-category-set"); 70 error ("Multibyte string in make-category-set");
71 71
72 len = XSTRING (categories)->size; 72 len = SCHARS (categories);
73 while (--len >= 0) 73 while (--len >= 0)
74 { 74 {
75 Lisp_Object category; 75 Lisp_Object category;
76 76
77 XSETFASTINT (category, XSTRING (categories)->data[len]); 77 XSETFASTINT (category, SREF (categories, len));
78 CHECK_CATEGORY (category); 78 CHECK_CATEGORY (category);
79 SET_CATEGORY_SET (val, category, Qt); 79 SET_CATEGORY_SET (val, category, Qt);
80 } 80 }
81 return val; 81 return val;
82 } 82 }