Mercurial > hg > xemacs-beta

comparison src/text.h @ 1726:a8d8f419b459

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2003-09-30 15:26:34 by james] Add type information to xfree to avoid alias creation.
author james
date Tue, 30 Sep 2003 15:27:01 +0000
parents 34abfb24e891
children 543769b89fed
comparison
equal deleted inserted replaced
1725:7ff8f4d70aec 1726:a8d8f419b459
2080 #define eifree(ei) \ 2080 #define eifree(ei) \
2081 do { \ 2081 do { \
2082 if ((ei)->mallocp_) \ 2082 if ((ei)->mallocp_) \
2083 { \ 2083 { \
2084 if ((ei)->data_) \ 2084 if ((ei)->data_) \
2085 xfree ((ei)->data_); \ 2085 xfree ((ei)->data_, Ibyte *); \
2086 if ((ei)->extdata_) \ 2086 if ((ei)->extdata_) \
2087 xfree ((ei)->extdata_); \ 2087 xfree ((ei)->extdata_, Extbyte *); \
2088 eiinit_malloc (ei); \ 2088 eiinit_malloc (ei); \
2089 } \ 2089 } \
2090 else \ 2090 else \
2091 eiinit (ei); \ 2091 eiinit (ei); \
2092 } while (0) 2092 } while (0)
2107 \ 2107 \
2108 (ei)->max_size_allocated_ = \ 2108 (ei)->max_size_allocated_ = \
2109 eifind_large_enough_buffer (0, (ei)->bytelen_ + 1); \ 2109 eifind_large_enough_buffer (0, (ei)->bytelen_ + 1); \
2110 ei13newdata = (Ibyte *) ALLOCA ((ei)->max_size_allocated_); \ 2110 ei13newdata = (Ibyte *) ALLOCA ((ei)->max_size_allocated_); \
2111 memcpy (ei13newdata, (ei)->data_, (ei)->bytelen_ + 1); \ 2111 memcpy (ei13newdata, (ei)->data_, (ei)->bytelen_ + 1); \
2112 xfree ((ei)->data_); \ 2112 xfree ((ei)->data_, Ibyte *); \
2113 (ei)->data_ = ei13newdata; \ 2113 (ei)->data_ = ei13newdata; \
2114 } \ 2114 } \
2115 \ 2115 \
2116 if ((ei)->extdata_) \ 2116 if ((ei)->extdata_) \
2117 { \ 2117 { \
2119 \ 2119 \
2120 memcpy (ei13newdata, (ei)->extdata_, (ei)->extlen_); \ 2120 memcpy (ei13newdata, (ei)->extdata_, (ei)->extlen_); \
2121 /* Double null-terminate in case of Unicode data */ \ 2121 /* Double null-terminate in case of Unicode data */ \
2122 ei13newdata[(ei)->extlen_] = '\0'; \ 2122 ei13newdata[(ei)->extlen_] = '\0'; \
2123 ei13newdata[(ei)->extlen_ + 1] = '\0'; \ 2123 ei13newdata[(ei)->extlen_ + 1] = '\0'; \
2124 xfree ((ei)->extdata_); \ 2124 xfree ((ei)->extdata_, Extbyte *); \
2125 (ei)->extdata_ = ei13newdata; \ 2125 (ei)->extdata_ = ei13newdata; \
2126 } \ 2126 } \
2127 } while (0) 2127 } while (0)
2128 2128
2129 2129
2321 do { \ 2321 do { \
2322 if ((ei)->mallocp_) \ 2322 if ((ei)->mallocp_) \
2323 { \ 2323 { \
2324 if ((ei)->extdata_) \ 2324 if ((ei)->extdata_) \
2325 { \ 2325 { \
2326 xfree ((ei)->extdata_); \ 2326 xfree ((ei)->extdata_, Extbyte *); \
2327 (ei)->extdata_ = 0; \ 2327 (ei)->extdata_ = 0; \
2328 } \ 2328 } \
2329 TO_EXTERNAL_FORMAT (DATA, ((ei)->data_, (ei)->bytelen_), \ 2329 TO_EXTERNAL_FORMAT (DATA, ((ei)->data_, (ei)->bytelen_), \
2330 MALLOC, ((ei)->extdata_, (ei)->extlen_), \ 2330 MALLOC, ((ei)->extdata_, (ei)->extlen_), \
2331 codesys); \ 2331 codesys); \