/* Copyright (C) 2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: nfaxml.c,v 1.10 2006-08-04 14:35:40 adam Exp $
+ * $Id: nfaxml.c,v 1.11 2006-10-09 14:22:43 heikki Exp $
*/
/**
if (res == 0) {
/* should be caught earlier */
yaz_log(YLOG_FATAL,"Illegal utf-8 sequence "
- "%d bytes into '%s' in %s, rule %d ",
- cp-content, content, filename, rulenumber);
+ "%ld bytes into '%s' in %s, rule %d ",
+ (long)(cp-content), content, filename, rulenumber);
xmlFree(content);
return -1;
}
/* Copyright (C) 2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: nfatest1.c,v 1.7 2006-10-04 16:59:34 mike Exp $
+ * $Id: nfatest1.c,v 1.8 2006-10-09 14:22:44 heikki Exp $
*
*/
size_t buflen2 = buflen;
i = yaz_nfa_match(n,&c, &buflen2,&resptr);
if (yaz_test_get_verbosity()>3)
- printf("\n'%s' returned %d. Moved c by %d, and resulted in '%s'\n",
- expstr, i, (c-buf),(char*)resptr);
+ printf("\n'%s' returned %d. Moved c by %ld, and resulted in '%s'\n",
+ expstr, i, (long)(c-buf),(char*)resptr);
YAZ_CHECK_EQ(buflen-buflen2, c-buf);
YAZ_CHECK_EQ(i, expcode);
if (i==0)
while((bi!=2) && (yaz_test_get_verbosity()>3)){
bi = yaz_nfa_get_backref(n, i,&cp1,&cp2);
if (bi==0 && ( cp1 || cp2 ) ) {
- printf(" got backref %d of %d chars (%p to %p): '",
- i, cp2-cp1+1, cp1, cp2);
+ printf(" got backref %d of %ld chars (%p to %p): '",
+ i, (long)(cp2-cp1+1), cp1, cp2);
while (cp2-cp1 >= 0 )
printf("%c", *cp1++);
printf("'\n");
YAZ_CHECK_EQ(*cp1, 'z' );
YAZ_CHECK_EQ(*cp2, 'k' );
if (yaz_test_get_verbosity()>3)
- printf("backref from %p '%c' to %p '%c' is %d long. sz is now %d\n",
- cp1, *cp1, cp2, *cp2, cp2-cp1+1, sz );
+ printf("backref from %p '%c' to %p '%c' is %ld long. sz is now %ld\n",
+ cp1, *cp1, cp2, *cp2, (long)(cp2-cp1+1), (long)sz );
yaz_nfa_destroy(n);
}
YAZ_CHECK_EQ(i,YAZ_NFA_SUCCESS);
i=yaz_nfa_get_backref(n, 2, &cp1, &cp2 );
if (yaz_test_get_verbosity()>3)
- printf("backref from %p '%c' to %p '%c' is %d long. sz is now %d\n",
- cp1, *cp1, cp2, *cp2, cp2-cp1+1, sz );
+ printf("backref from %p '%c' to %p '%c' is %ld long. sz is now %ld\n",
+ cp1, *cp1, cp2, *cp2, (long)(cp2-cp1+1), (long)sz );
YAZ_CHECK_EQ(i,0);
- YAZ_CHECK_EQ((int)c1,(int)c2); /* got our pointer back from nfa */
+ /*YAZ_CHECK_EQ((int)c1,(int)c2);*/ /* got our pointer back from nfa */
+ YAZ_CHECK(c1==c2); /* got our pointer back from nfa */
for(i=0;i<1024;i++)
outbuf[i]=10000+i;
outp=outbuf;
/* Copyright (C) 2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: nfaxmltest1.c,v 1.8 2006-10-04 16:59:34 mike Exp $
+ * $Id: nfaxmltest1.c,v 1.9 2006-10-09 14:22:44 heikki Exp $
*
*/
static void test5(void) {
struct conv_test {
- unsigned char *name;
+ char *name;
int expresult;
- unsigned char *xml;
- unsigned char *from;
- unsigned char *to;
+ char *xml;
+ char *from;
+ char *to;
};
struct conv_test tests[]= {
{ "test5-1", YAZ_NFA_SUCCESS,
yaz_nfa *nfa;
yaz_nfa_char frombuf[MAXBUF];
yaz_nfa_char tobuf[MAXBUF];
- unsigned char charbuf[MAXBUF];
+ char charbuf[MAXBUF];
struct conv_test *thistest=tests;
- unsigned char *cp;
+ char *cp;
yaz_nfa_char *ycp;
size_t incharsleft;
size_t outcharsleft;
}
ycp=frombuf;
cp=thistest->from;
- while ( (*ycp++ = *cp++) )
+ while ( (*ycp++ = (unsigned char)*cp++) )
; /* strcpy, but expand to yaz_nfa_chars */
incharsleft = strlen(thistest->from);
prev_incharsleft = 0;
* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: marcdump.c,v 1.42 2006-08-28 14:18:23 adam Exp $
+ * $Id: marcdump.c,v 1.43 2006-10-09 14:22:44 heikki Exp $
*/
#define _FILE_OFFSET_BITS 64
if (len < 25 || len > 100000)
{
long off = ftell(inf) - 5;
- printf("Bad Length %d read at offset %ld (%lx)\n",
- len, (long) off, (long) off);
+ printf("Bad Length %ld read at offset %ld (%lx)\n",
+ (long)len, (long) off, (long) off);
break;
}
rlen = len - 5;