-const char encode_rcs[] = "$Id: encode.c,v 1.3 2001/11/13 00:16:40 jongfoster Exp $";
+const char encode_rcs[] = "$Id: encode.c,v 1.7 2002/03/24 13:25:43 swa Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/encode.c,v $
* encode cookies and HTML text.
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
- * IJBSWA team. http://ijbswa.sourceforge.net
+ * Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
*
* Revisions :
* $Log: encode.c,v $
+ * Revision 1.7 2002/03/24 13:25:43 swa
+ * name change related issues
+ *
+ * Revision 1.6 2002/03/13 00:27:04 jongfoster
+ * Killing warnings
+ *
+ * Revision 1.5 2002/03/07 03:46:53 oes
+ * Fixed compiler warnings etc
+ *
+ * Revision 1.4 2002/01/22 23:28:07 jongfoster
+ * Adding convenience function html_encode_and_free_original()
+ * Making all functions accept NULL paramaters - in this case, they
+ * simply return NULL. This allows error-checking to be deferred.
+ *
* Revision 1.3 2001/11/13 00:16:40 jongfoster
* Replacing references to malloc.h with the standard stdlib.h
* (See ANSI or K&R 2nd Ed)
* Returns : The integer value, or -1 for non-hex characters.
*
*********************************************************************/
-static int xdtoi(char d)
+static int xdtoi(const int d)
{
if ((d >= '0') && (d <= '9'))
{
{
int d1, d2;
- d1 = xdtoi(*s++);
+ d1 = xdtoi(*s);
if(d1 >= 0)
{
- d2 = xdtoi(*s);
+ d2 = xdtoi(*(s+1));
if(d2 >= 0)
{
return (d1 << 4) + d2;
break;
case '%':
- if ((*q = xtoi(s + 1)))
+ if ((*q = xtoi(s + 1)) != '\0')
{
s += 3;
q++;