/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: ber_int.c,v $
- * Revision 1.10 1995-09-29 17:01:50 quinn
- * More Windows work
- *
- * Revision 1.9 1995/09/28 10:12:39 quinn
- * Windows-support changes
- *
- * Revision 1.8 1995/09/27 15:02:55 quinn
- * Modified function heads & prototypes.
- *
- * Revision 1.7 1995/05/16 08:50:44 quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.6 1995/04/18 08:15:14 quinn
- * Added dynamic memory allocation on encoding (whew). Code is now somewhat
- * neater. We'll make the same change for decoding one day.
- *
- * Revision 1.5 1995/03/27 15:01:44 quinn
- * Added include of sys/types to further portability
- *
- * Revision 1.4 1995/03/08 12:12:07 quinn
- * Added better error checking.
- *
- * Revision 1.3 1995/02/09 15:51:46 quinn
- * Works better now.
- *
- * Revision 1.2 1995/02/07 17:52:58 quinn
- * A damn mess, but now things work, I think.
- *
- * Revision 1.1 1995/02/02 16:21:52 quinn
- * First kick.
- *
+ * $Id: ber_int.c,v 1.21 2003-01-06 08:20:27 adam Exp $
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <string.h>
-#include <sys/types.h>
-
-#ifdef WINDOWS
+#ifdef WIN32
#include <winsock.h>
#else
-#include <netinet/in.h> /* for htons... */
+#include <sys/types.h>
+#include <netinet/in.h>
#endif
-#include <string.h>
-
-#include <odr.h>
-#include <prt.h>
+#include "odr-priv.h"
-static int MDF ber_encinteger(ODR o, int val);
-static int MDF ber_decinteger(unsigned char *buf, int *val);
+static int ber_encinteger(ODR o, int val);
+static int ber_decinteger(const unsigned char *buf, int *val);
-int MDF ber_integer(ODR o, int *val)
+int ber_integer(ODR o, int *val)
{
int res;
return 0;
}
o->bp += res;
- o->left -= res;
return 1;
case ODR_ENCODE:
if ((res = ber_encinteger(o, *val)) < 0)
/*
* Returns: number of bytes written or -1 for error (out of bounds).
*/
-int MDF ber_encinteger(ODR o, int val)
+int ber_encinteger(ODR o, int val)
{
int lenpos;
int a, len;
if (odr_putc(o, 0) < 0) /* dummy */
return -1;
tmp.i = htonl(val); /* ensure that that we're big-endian */
- for (a = 0; a < sizeof(int) - 1; a++) /* skip superfluous octets */
+ for (a = 0; a < (int) sizeof(int) - 1; a++) /* skip superfluous octets */
if (!((tmp.c[a] == 0 && !(tmp.c[a+1] & 0X80)) ||
(tmp.c[a] == 0XFF && (tmp.c[a+1] & 0X80))))
break;
/*
* Returns: Number of bytes read or 0 if no match, -1 if error.
*/
-int MDF ber_decinteger(unsigned char *buf, int *val)
+int ber_decinteger(const unsigned char *buf, int *val)
{
- unsigned char *b = buf, fill;
+ const unsigned char *b = buf;
+ unsigned char fill;
int res, len, remains;
union { int i; unsigned char c[sizeof(int)]; } tmp;
if ((res = ber_declen(b, &len)) < 0)
return -1;
- if (len > sizeof(int)) /* let's be reasonable, here */
+ if (len > (int) sizeof(int)) /* let's be reasonable, here */
return -1;
b+= res;