cookie_t *cookie);
-extern char *chxj_chtml10_emoji_only_converter(request_rec *r, const char *src, apr_size_t len);
+extern char *chxj_chtml10_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len);
#endif
chxjconvrule_entry *entryp,
cookie_t *cookie);
-extern char *chxj_chtml20_emoji_only_converter(request_rec *r, const char *src, apr_size_t len);
+extern char *chxj_chtml20_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len);
#endif
cookie_t *cookie);
-extern char *chxj_chtml30_emoji_only_converter(request_rec *r, const char *src, apr_size_t len);
+extern char *chxj_chtml30_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len);
#endif
chxjconvrule_entry *entryp,
cookie_t *cookie);
-extern char *chxj_chtml40_emoji_only_converter(request_rec *r, const char *src, apr_size_t len);
+extern char *chxj_chtml40_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len);
#endif
cookie_t *cookie);
-extern char *chxj_chtml50_emoji_only_converter(request_rec *r, const char *src, apr_size_t len);
+extern char *chxj_chtml50_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len);
#endif
cookie_t *cookie);
-extern char *chxj_jhtml_emoji_only_converter(request_rec *r, const char *src, apr_size_t len);
+extern char *chxj_jhtml_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len);
#endif
cookie_t *cookie);
-extern char *chxj_jxhtml_emoji_only_converter(request_rec *r, const char *src, apr_size_t len);
+extern char *chxj_jxhtml_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len);
#endif
char *(*emoji_only_converter)(
- request_rec *r,
- const char *src,
- apr_size_t len);
+ request_rec *r,
+ struct device_table_t *spec,
+ const char *src,
+ apr_size_t len);
};
extern converter_t convert_routine[];
cookie_t *cookie);
-extern char *chxj_xhtml_emoji_only_converter(request_rec *r, const char *src, apr_size_t len);
+extern char *chxj_xhtml_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len);
#endif
}
char *
-chxj_chtml10_emoji_only_converter(request_rec *r, const char *src, apr_size_t len)
+chxj_chtml10_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len)
{
apr_size_t ii;
- Doc doc;
+ Doc __doc;
+ Doc *doc;
chtml10_t __chtml10;
chtml10_t *chtml10;
char one_byte[2];
apr_pool_t *pool;
chtml10 = &__chtml10;
+ doc = &__doc;
DBG(r, "REQ[%X] start chxj_chtml10_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
memset(doc, 0, sizeof(Doc));
apr_pool_create(&pool, r->pool);
- chxj_buffered_write_init(pool, &doc.buf);
+ chxj_buffered_write_init(pool, &doc->buf);
for (ii=0; ii<len; ii++) {
char *out;
int rtn;
- rtn = s_chtml10_search_emoji(chtml10, &src[ii], &out);
+ rtn = s_chtml10_search_emoji(chtml10, (char *)&src[ii], &out);
if (rtn) {
W_V(out);
ii+=(rtn - 1);
}
else {
one_byte[0] = src[ii+0];
- one_Byte[1] = 0;
+ one_byte[1] = 0;
W_V(one_byte);
}
}
}
char *
-chxj_chtml20_emoji_only_converter(request_rec *r, const char *src, apr_size_t len)
+chxj_chtml20_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len)
{
apr_size_t ii;
- Doc doc;
+ Doc __doc;
+ Doc *doc;
chtml20_t __chtml20;
chtml20_t *chtml20;
char one_byte[2];
apr_pool_t *pool;
chtml20 = &__chtml20;
+ doc = &__doc;
DBG(r, "REQ[%X] start chxj_chtml20_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
memset(doc, 0, sizeof(Doc));
apr_pool_create(&pool, r->pool);
- chxj_buffered_write_init(pool, &doc.buf);
+ chxj_buffered_write_init(pool, &doc->buf);
for (ii=0; ii<len; ii++) {
char *out;
int rtn;
- rtn = s_chtml20_search_emoji(chtml20, &src[ii], &out);
+ rtn = s_chtml20_search_emoji(chtml20, (char *)&src[ii], &out);
if (rtn) {
W_V(out);
ii+=(rtn - 1);
}
else {
one_byte[0] = src[ii+0];
- one_Byte[1] = 0;
+ one_byte[1] = 0;
W_V(one_byte);
}
}
char *
-chxj_chtml30_emoji_only_converter(request_rec *r, const char *src, apr_size_t len)
+chxj_chtml30_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len)
{
apr_size_t ii;
- Doc doc;
+ Doc __doc;
+ Doc *doc;
chtml30_t __chtml30;
chtml30_t *chtml30;
char one_byte[2];
apr_pool_t *pool;
chtml30 = &__chtml30;
+ doc = &__doc;
DBG(r, "REQ[%X] start chxj_chtml30_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
memset(doc, 0, sizeof(Doc));
apr_pool_create(&pool, r->pool);
- chxj_buffered_write_init(pool, &doc.buf);
+ chxj_buffered_write_init(pool, &doc->buf);
for (ii=0; ii<len; ii++) {
char *out;
int rtn;
- rtn = s_chtml30_search_emoji(chtml30, &src[ii], &out);
+ rtn = s_chtml30_search_emoji(chtml30, (char *)&src[ii], &out);
if (rtn) {
W_V(out);
ii+=(rtn - 1);
}
else {
one_byte[0] = src[ii+0];
- one_Byte[1] = 0;
+ one_byte[1] = 0;
W_V(one_byte);
}
}
char *
-chxj_chtml40_emoji_only_converter(request_rec *r, const char *src, apr_size_t len)
+chxj_chtml40_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len)
{
apr_size_t ii;
- Doc doc;
+ Doc __doc;
+ Doc *doc;
chtml40_t __chtml40;
chtml40_t *chtml40;
char one_byte[2];
apr_pool_t *pool;
chtml40 = &__chtml40;
+ doc = &__doc;
DBG(r, "REQ[%X] start chxj_chtml40_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
memset(doc, 0, sizeof(Doc));
apr_pool_create(&pool, r->pool);
- chxj_buffered_write_init(pool, &doc.buf);
+ chxj_buffered_write_init(pool, &doc->buf);
for (ii=0; ii<len; ii++) {
char *out;
int rtn;
- rtn = s_chtml40_search_emoji(chtml40, &src[ii], &out);
+ rtn = s_chtml40_search_emoji(chtml40, (char *)&src[ii], &out);
if (rtn) {
W_V(out);
ii+=(rtn - 1);
}
else {
one_byte[0] = src[ii+0];
- one_Byte[1] = 0;
+ one_byte[1] = 0;
W_V(one_byte);
}
}
char *
-chxj_chtml50_emoji_only_converter(request_rec *r, const char *src, apr_size_t len)
+chxj_chtml50_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len)
{
apr_size_t ii;
- Doc doc;
+ Doc __doc;
+ Doc *doc;
chtml50_t __chtml50;
chtml50_t *chtml50;
char one_byte[2];
apr_pool_t *pool;
chtml50 = &__chtml50;
+ doc = &__doc;
DBG(r, "REQ[%X] start chxj_chtml50_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
memset(doc, 0, sizeof(Doc));
apr_pool_create(&pool, r->pool);
- chxj_buffered_write_init(pool, &doc.buf);
+ chxj_buffered_write_init(pool, &doc->buf);
for (ii=0; ii<len; ii++) {
char *out;
int rtn;
- rtn = s_chtml50_search_emoji(chtml50, &src[ii], &out);
+ rtn = s_chtml50_search_emoji(chtml50, (char *)&src[ii], &out);
if (rtn) {
W_V(out);
ii+=(rtn - 1);
}
else {
one_byte[0] = src[ii+0];
- one_Byte[1] = 0;
+ one_byte[1] = 0;
W_V(one_byte);
}
}
char *
-chxj_jhtml_emoji_only_converter(request_rec *r, const char *src, apr_size_t len)
+chxj_jhtml_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len)
{
apr_size_t ii;
- Doc doc;
+ Doc __doc;
+ Doc *doc;
jhtml_t __jhtml;
jhtml_t *jhtml;
char one_byte[2];
apr_pool_t *pool;
jhtml = &__jhtml;
+ doc = &__doc;
DBG(r, "REQ[%X] start chxj_jhtml_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
- memset(doc, 0, sizeof(Doc));
+ memset(doc, 0, sizeof(Doc));
memset(jhtml, 0, sizeof(jhtml_t));
- doc->r = r;
+ doc->r = r;
jhtml->doc = doc;
jhtml->spec = spec;
jhtml->out = qs_alloc_zero_byte_string(r->pool);
apr_pool_create(&pool, r->pool);
- chxj_buffered_write_init(pool, &doc.buf);
+ chxj_buffered_write_init(pool, &doc->buf);
for (ii=0; ii<len; ii++) {
char *out;
int rtn;
- rtn = s_jhtml_search_emoji(jhtml, &src[ii], &out);
+ rtn = s_jhtml_search_emoji(jhtml, (char *)&src[ii], &out);
if (rtn) {
W_V(out);
ii+=(rtn - 1);
}
else {
one_byte[0] = src[ii+0];
- one_Byte[1] = 0;
+ one_byte[1] = 0;
W_V(one_byte);
}
}
char *
-chxj_jxhtml_emoji_only_converter(request_rec *r, const char *src, apr_size_t len)
+chxj_jxhtml_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len)
{
apr_size_t ii;
- Doc doc;
+ Doc __doc;
+ Doc *doc;
jxhtml_t __jxhtml;
jxhtml_t *jxhtml;
char one_byte[2];
apr_pool_t *pool;
jxhtml = &__jxhtml;
+ doc = &__doc;
DBG(r, "REQ[%X] start chxj_jxhtml_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
- memset(doc, 0, sizeof(Doc));
+ memset(doc, 0, sizeof(Doc));
memset(jxhtml, 0, sizeof(jxhtml_t));
- doc->r = r;
+ doc->r = r;
jxhtml->doc = doc;
jxhtml->spec = spec;
jxhtml->out = qs_alloc_zero_byte_string(r->pool);
apr_pool_create(&pool, r->pool);
- chxj_buffered_write_init(pool, &doc.buf);
+ chxj_buffered_write_init(pool, &doc->buf);
for (ii=0; ii<len; ii++) {
char *out;
int rtn;
- rtn = s_jxhtml_search_emoji(jxhtml, &src[ii], &out);
+ rtn = s_jxhtml_search_emoji(jxhtml, (char *)&src[ii], &out);
if (rtn) {
W_V(out);
ii+=(rtn - 1);
}
else {
one_byte[0] = src[ii+0];
- one_Byte[1] = 0;
+ one_byte[1] = 0;
W_V(one_byte);
}
}
char *
-chxj_xhtml_emoji_only_converter(request_rec *r, const char *src, apr_size_t len)
+chxj_xhtml_emoji_only_converter(request_rec *r, device_table *spec, const char *src, apr_size_t len)
{
apr_size_t ii;
- Doc doc;
+ Doc __doc;
+ Doc *doc;
xhtml_t __xhtml;
xhtml_t *xhtml;
char one_byte[2];
apr_pool_t *pool;
xhtml = &__xhtml;
+ doc = &__doc;
DBG(r, "REQ[%X] start chxj_xhtml_emoji_eonly_converter()", (apr_size_t)(unsigned int)r);
memset(doc, 0, sizeof(Doc));
apr_pool_create(&pool, r->pool);
- chxj_buffered_write_init(pool, &doc.buf);
+ chxj_buffered_write_init(pool, &doc->buf);
for (ii=0; ii<len; ii++) {
char *out;
int rtn;
- rtn = s_xhtml_search_emoji(xhtml, &src[ii], &out);
+ rtn = s_xhtml_search_emoji(xhtml, (char *)&src[ii], &out);
if (rtn) {
W_V(out);
ii+=(rtn - 1);
}
else {
one_byte[0] = src[ii+0];
- one_Byte[1] = 0;
+ one_byte[1] = 0;
W_V(one_byte);
}
}
* save cookie.
*/
cookie = NULL;
- if (entryp->action & CONVRULE_COOKIE_ON_BIT) {
+ if (entryp->action & CONVRULE_COOKIE_ON_BIT && !(entryp->action & CONVRULE_EMOJI_ONLY_BIT)) {
switch(spec->html_spec_type) {
case CHXJ_SPEC_Chtml_1_0:
case CHXJ_SPEC_Chtml_2_0:
if (entryp->action & CONVRULE_EMOJI_ONLY_BIT) {
if (convert_routine[spec->html_spec_type].emoji_only_converter) {
if (tmp) {
- dst = convert_routine[spec->html_spec_type].emoji_only_converter(r,tmp,*len);
+ dst = convert_routine[spec->html_spec_type].emoji_only_converter(r,spec, tmp,*len);
}
else {
- dst = convert_routine[spec->html_spec_type].emoji_only_converter(r,*src,*len);
+ dst = convert_routine[spec->html_spec_type].emoji_only_converter(r,spec, *src,*len);
}
if (dst != NULL) {
*len = strlen(dst);