Mercurial > hg > xemacs-beta
comparison src/text.h @ 4982:3c3c1d139863
Automatic merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Feb 2010 11:25:00 -0600 |
parents | 4aebb0131297 16112448d484 |
children | ae48681c47fa 46cf825f6158 |
comparison
equal
deleted
inserted
replaced
4981:4aebb0131297 | 4982:3c3c1d139863 |
---|---|
2008 #define eifree(ei) \ | 2008 #define eifree(ei) \ |
2009 do { \ | 2009 do { \ |
2010 if ((ei)->mallocp_) \ | 2010 if ((ei)->mallocp_) \ |
2011 { \ | 2011 { \ |
2012 if ((ei)->data_) \ | 2012 if ((ei)->data_) \ |
2013 xfree ((ei)->data_, Ibyte *); \ | 2013 xfree ((ei)->data_); \ |
2014 if ((ei)->extdata_) \ | 2014 if ((ei)->extdata_) \ |
2015 xfree ((ei)->extdata_, Extbyte *); \ | 2015 xfree ((ei)->extdata_); \ |
2016 eiinit_malloc (ei); \ | 2016 eiinit_malloc (ei); \ |
2017 } \ | 2017 } \ |
2018 else \ | 2018 else \ |
2019 eiinit (ei); \ | 2019 eiinit (ei); \ |
2020 } while (0) | 2020 } while (0) |
2035 \ | 2035 \ |
2036 (ei)->max_size_allocated_ = \ | 2036 (ei)->max_size_allocated_ = \ |
2037 eifind_large_enough_buffer (0, (ei)->bytelen_ + 1); \ | 2037 eifind_large_enough_buffer (0, (ei)->bytelen_ + 1); \ |
2038 ei13newdata = alloca_ibytes ((ei)->max_size_allocated_); \ | 2038 ei13newdata = alloca_ibytes ((ei)->max_size_allocated_); \ |
2039 memcpy (ei13newdata, (ei)->data_, (ei)->bytelen_ + 1); \ | 2039 memcpy (ei13newdata, (ei)->data_, (ei)->bytelen_ + 1); \ |
2040 xfree ((ei)->data_, Ibyte *); \ | 2040 xfree ((ei)->data_); \ |
2041 (ei)->data_ = ei13newdata; \ | 2041 (ei)->data_ = ei13newdata; \ |
2042 } \ | 2042 } \ |
2043 \ | 2043 \ |
2044 if ((ei)->extdata_) \ | 2044 if ((ei)->extdata_) \ |
2045 { \ | 2045 { \ |
2047 \ | 2047 \ |
2048 memcpy (ei13newdata, (ei)->extdata_, (ei)->extlen_); \ | 2048 memcpy (ei13newdata, (ei)->extdata_, (ei)->extlen_); \ |
2049 /* Double null-terminate in case of Unicode data */ \ | 2049 /* Double null-terminate in case of Unicode data */ \ |
2050 ei13newdata[(ei)->extlen_] = '\0'; \ | 2050 ei13newdata[(ei)->extlen_] = '\0'; \ |
2051 ei13newdata[(ei)->extlen_ + 1] = '\0'; \ | 2051 ei13newdata[(ei)->extlen_ + 1] = '\0'; \ |
2052 xfree ((ei)->extdata_, Extbyte *); \ | 2052 xfree ((ei)->extdata_); \ |
2053 (ei)->extdata_ = ei13newdata; \ | 2053 (ei)->extdata_ = ei13newdata; \ |
2054 } \ | 2054 } \ |
2055 } while (0) | 2055 } while (0) |
2056 | 2056 |
2057 | 2057 |
2249 do { \ | 2249 do { \ |
2250 if ((ei)->mallocp_) \ | 2250 if ((ei)->mallocp_) \ |
2251 { \ | 2251 { \ |
2252 if ((ei)->extdata_) \ | 2252 if ((ei)->extdata_) \ |
2253 { \ | 2253 { \ |
2254 xfree ((ei)->extdata_, Extbyte *); \ | 2254 xfree ((ei)->extdata_); \ |
2255 (ei)->extdata_ = 0; \ | 2255 (ei)->extdata_ = 0; \ |
2256 } \ | 2256 } \ |
2257 TO_EXTERNAL_FORMAT (DATA, ((ei)->data_, (ei)->bytelen_), \ | 2257 TO_EXTERNAL_FORMAT (DATA, ((ei)->data_, (ei)->bytelen_), \ |
2258 MALLOC, ((ei)->extdata_, (ei)->extlen_), \ | 2258 MALLOC, ((ei)->extdata_, (ei)->extlen_), \ |
2259 codesys); \ | 2259 codesys); \ |