oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

const-ize

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7130 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-10-10 04:55:28 +00:00
parent 41d5fed9f9
commit a74d27d3d7
16 changed files with 97 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/asn1/der_get.c
View File

@@ -51,7 +51,8 @@ RCSID("$Id$");
*/
static int
der_get_unsigned (unsigned char *p, size_t len, unsigned *ret, size_t *size)
der_get_unsigned (const unsigned char *p, size_t len,
unsigned *ret, size_t *size)
{
unsigned val = 0;
size_t oldlen = len;
@@ -64,7 +65,8 @@ der_get_unsigned (unsigned char *p, size_t len, unsigned *ret, size_t *size)
}
int
der_get_int (unsigned char *p, size_t len, int *ret, size_t *size)
der_get_int (const unsigned char *p, size_t len,
int *ret, size_t *size)
{
int val = 0;
size_t oldlen = len;
@@ -79,7 +81,8 @@ der_get_int (unsigned char *p, size_t len, int *ret, size_t *size)
}
int
der_get_length (unsigned char *p, size_t len, size_t *val, size_t *size)
der_get_length (const unsigned char *p, size_t len,
size_t *val, size_t *size)
{
size_t v;
@@ -112,7 +115,7 @@ der_get_length (unsigned char *p, size_t len, size_t *val, size_t *size)
}
int
der_get_general_string (unsigned char *p, size_t len,
der_get_general_string (const unsigned char *p, size_t len,
general_string *str, size_t *size)
{
char *s;
@@ -128,7 +131,7 @@ der_get_general_string (unsigned char *p, size_t len,
}
int
der_get_octet_string (unsigned char *p, size_t len,
der_get_octet_string (const unsigned char *p, size_t len,
octet_string *data, size_t *size)
{
data->length = len;
@@ -141,7 +144,8 @@ der_get_octet_string (unsigned char *p, size_t len,
}
int
der_get_tag (unsigned char *p, size_t len, Der_class *class, Der_type *type,
der_get_tag (const unsigned char *p, size_t len,
Der_class *class, Der_type *type,
int *tag, size_t *size)
{
if (len < 1)
@@ -154,7 +158,8 @@ der_get_tag (unsigned char *p, size_t len, Der_class *class, Der_type *type,
}
int
der_match_tag (unsigned char *p, size_t len, Der_class class, Der_type type,
der_match_tag (const unsigned char *p, size_t len,
Der_class class, Der_type type,
int tag, size_t *size)
{
size_t l;
@@ -176,7 +181,7 @@ der_match_tag (unsigned char *p, size_t len, Der_class class, Der_type type,
}
int
der_match_tag_and_length (unsigned char *p, size_t len,
der_match_tag_and_length (const unsigned char *p, size_t len,
Der_class class, Der_type type, int tag,
size_t *length_ret, size_t *size)
{
@@ -198,7 +203,8 @@ der_match_tag_and_length (unsigned char *p, size_t len,
}
int
decode_integer (unsigned char *p, size_t len, int *num, size_t *size)
decode_integer (const unsigned char *p, size_t len,
int *num, size_t *size)
{
size_t ret = 0;
size_t l, reallen;
@@ -224,7 +230,7 @@ decode_integer (unsigned char *p, size_t len, int *num, size_t *size)
}
int
decode_general_string (unsigned char *p, size_t len,
decode_general_string (const unsigned char *p, size_t len,
general_string *str, size_t *size)
{
size_t ret = 0;
@@ -256,7 +262,7 @@ decode_general_string (unsigned char *p, size_t len,
}
int
decode_octet_string (unsigned char *p, size_t len,
decode_octet_string (const unsigned char *p, size_t len,
octet_string *k, size_t *size)
{
size_t ret = 0;
@@ -288,7 +294,7 @@ decode_octet_string (unsigned char *p, size_t len,
}
static void
generalizedtime2time (char *s, time_t *t)
generalizedtime2time (const char *s, time_t *t)
{
struct tm tm;
@@ -302,7 +308,8 @@ generalizedtime2time (char *s, time_t *t)
}
int
decode_generalized_time (unsigned char *p, size_t len, time_t *t, size_t *size)
decode_generalized_time (const unsigned char *p, size_t len,
time_t *t, size_t *size)
{
octet_string k;
char *times;

8
lib/asn1/der_length.c
View File

@@ -82,7 +82,7 @@ length_len (size_t len)
}
size_t
length_integer (int *data)
length_integer (const int *data)
{
size_t len = length_int (*data);
@@ -90,7 +90,7 @@ length_integer (int *data)
}
size_t
length_general_string (general_string *data)
length_general_string (const general_string *data)
{
char *str = *data;
size_t len = strlen(str);
@@ -98,13 +98,13 @@ length_general_string (general_string *data)
}
size_t
length_octet_string (octet_string *k)
length_octet_string (const octet_string *k)
{
return 1 + length_len(k->length) + k->length;
}
size_t
length_generalized_time (time_t *t)
length_generalized_time (const time_t *t)
{
octet_string k;
size_t ret;

13
lib/asn1/der_put.c
View File

@@ -140,7 +140,7 @@ der_put_length (unsigned char *p, size_t len, size_t val, size_t *size)
int
der_put_general_string (unsigned char *p, size_t len,
general_string *str, size_t *size)
const general_string *str, size_t *size)
{
size_t slen = strlen(*str);
@@ -155,7 +155,7 @@ der_put_general_string (unsigned char *p, size_t len,
int
der_put_octet_string (unsigned char *p, size_t len,
octet_string *data, size_t *size)
const octet_string *data, size_t *size)
{
if (len < data->length)
return ASN1_OVERFLOW;
@@ -202,7 +202,7 @@ der_put_length_and_tag (unsigned char *p, size_t len, size_t len_val,
}
int
encode_integer (unsigned char *p, size_t len, int *data, size_t *size)
encode_integer (unsigned char *p, size_t len, const int *data, size_t *size)
{
int num = *data;
size_t ret = 0;
@@ -227,7 +227,7 @@ encode_integer (unsigned char *p, size_t len, int *data, size_t *size)
int
encode_general_string (unsigned char *p, size_t len,
general_string *data, size_t *size)
const general_string *data, size_t *size)
{
size_t ret = 0;
size_t l;
@@ -251,7 +251,7 @@ encode_general_string (unsigned char *p, size_t len,
int
encode_octet_string (unsigned char *p, size_t len,
octet_string *k, size_t *size)
const octet_string *k, size_t *size)
{
size_t ret = 0;
size_t l;
@@ -287,7 +287,8 @@ time2generalizedtime (time_t t, octet_string *s)
}
int
encode_generalized_time (unsigned char *p, size_t len, time_t *t, size_t *size)
encode_generalized_time (unsigned char *p, size_t len,
const time_t *t, size_t *size)
{
size_t ret = 0;
size_t l;

7
lib/asn1/gen.c
View File

@@ -106,7 +106,7 @@ close_generate ()
}
void
generate_constant (Symbol *s)
generate_constant (const Symbol *s)
{
fprintf (headerfile, "enum { %s = %d };\n\n",
s->gen_name, s->constant);
@@ -306,7 +306,7 @@ define_type (int level, char *name, Type *t, int typedefp)
}
static void
generate_type_header (Symbol *s)
generate_type_header (const Symbol *s)
{
fprintf (headerfile, "/*\n");
fprintf (headerfile, "%s ::= ", s->name);
@@ -321,9 +321,10 @@ generate_type_header (Symbol *s)
void
generate_type (Symbol *s)
generate_type (const Symbol *s)
{
char *filename;
asprintf (&filename, "%s_%s.x", STEM, s->gen_name);
codefile = fopen (filename, "w");
if (codefile == NULL)

8
lib/asn1/gen_copy.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -41,14 +41,14 @@
RCSID("$Id$");
static void
copy_primitive (char *typename, char *from, char *to)
copy_primitive (const char *typename, const char *from, const char *to)
{
fprintf (codefile, "if(copy_%s(%s, %s)) return ENOMEM;\n",
typename, from, to);
}
static void
copy_type (char *from, char *to, Type *t)
copy_type (const char *from, const char *to, const Type *t)
{
switch (t->type) {
case TType:
@@ -134,7 +134,7 @@ copy_type (char *from, char *to, Type *t)
}
void
generate_type_copy (Symbol *s)
generate_type_copy (const Symbol *s)
{
fprintf (headerfile,
"int copy_%s (const %s *, %s *);\n",

18
lib/asn1/gen_decode.c
View File

@@ -41,7 +41,7 @@
RCSID("$Id$");
static void
decode_primitive (char *typename, char *name)
decode_primitive (const char *typename, const char *name)
{
fprintf (codefile,
"e = decode_%s(p, len, %s, &l);\n"
@@ -51,7 +51,7 @@ decode_primitive (char *typename, char *name)
}
static void
decode_type (char *name, Type *t)
decode_type (const char *name, const Type *t)
{
switch (t->type) {
case TType:
@@ -265,10 +265,11 @@ decode_type (char *name, Type *t)
}
void
generate_type_decode (Symbol *s)
generate_type_decode (const Symbol *s)
{
fprintf (headerfile,
"int decode_%s(unsigned char *, size_t, %s *, size_t *);\n",
"int "
"decode_%s(const unsigned char *, size_t, %s *, size_t *);\n",
s->gen_name, s->gen_name);
fprintf (codefile, "#define FORW "
@@ -279,7 +280,8 @@ generate_type_decode (Symbol *s)
fprintf (codefile, "int\n"
"decode_%s(unsigned char *p, size_t len, %s *data, size_t *size)\n"
"decode_%s(const unsigned char *p,"
" size_t len, %s *data, size_t *size)\n"
"{\n",
s->gen_name, s->gen_name);
@@ -319,15 +321,15 @@ generate_type_decode (Symbol *s)
}
void
generate_seq_type_decode (Symbol *s)
generate_seq_type_decode (const Symbol *s)
{
fprintf (headerfile,
"int decode_seq_%s(unsigned char *, size_t, int, int, "
"int decode_seq_%s(const unsigned char *, size_t, int, int, "
"%s *, size_t *);\n",
s->gen_name, s->gen_name);
fprintf (codefile, "int\n"
"decode_seq_%s(unsigned char *p, size_t len, int tag, "
"decode_seq_%s(const unsigned char *p, size_t len, int tag, "
"int optional, %s *data, size_t *size)\n"
"{\n",
s->gen_name, s->gen_name);

14
lib/asn1/gen_encode.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -41,7 +41,7 @@
RCSID("$Id$");
static void
encode_primitive (char *typename, char *name)
encode_primitive (const char *typename, const char *name)
{
fprintf (codefile,
"e = encode_%s(p, len, %s, &l);\n"
@@ -51,7 +51,7 @@ encode_primitive (char *typename, char *name)
}
static void
encode_type (char *name, Type *t)
encode_type (const char *name, const Type *t)
{
switch (t->type) {
case TType:
@@ -204,17 +204,19 @@ encode_type (char *name, Type *t)
}
void
generate_type_encode (Symbol *s)
generate_type_encode (const Symbol *s)
{
fprintf (headerfile,
"int encode_%s(unsigned char *, size_t, %s *, size_t *);\n",
"int "
"encode_%s(unsigned char *, size_t, const %s *, size_t *);\n",
s->gen_name, s->gen_name);
fprintf (codefile, "#define BACK if (e) return e; p -= l; len -= l; ret += l\n\n");
fprintf (codefile, "int\n"
"encode_%s(unsigned char *p, size_t len, %s *data, size_t *size)\n"
"encode_%s(unsigned char *p, size_t len,"
" const %s *data, size_t *size)\n"
"{\n",
s->gen_name, s->gen_name);

8
lib/asn1/gen_free.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -41,13 +41,13 @@
RCSID("$Id$");
static void
free_primitive (char *typename, char *name)
free_primitive (const char *typename, const char *name)
{
fprintf (codefile, "free_%s(%s);\n", typename, name);
}
static void
free_type (char *name, Type *t)
free_type (const char *name, const Type *t)
{
switch (t->type) {
case TType:
@@ -118,7 +118,7 @@ free_type (char *name, Type *t)
}
void
generate_type_free (Symbol *s)
generate_type_free (const Symbol *s)
{
fprintf (headerfile,
"void free_%s (%s *);\n",

8
lib/asn1/gen_glue.c
View File

@@ -41,7 +41,7 @@
RCSID("$Id$");
static void
generate_2int (Symbol *s)
generate_2int (const Symbol *s)
{
Type *t = s->type;
Member *m;
@@ -69,7 +69,7 @@ generate_2int (Symbol *s)
}
static void
generate_int2 (Symbol *s)
generate_int2 (const Symbol *s)
{
Type *t = s->type;
Member *m;
@@ -101,7 +101,7 @@ generate_int2 (Symbol *s)
*/
static void
generate_units (Symbol *s)
generate_units (const Symbol *s)
{
Type *t = s->type;
Member *m;
@@ -130,7 +130,7 @@ generate_units (Symbol *s)
}
void
generate_glue (Symbol *s)
generate_glue (const Symbol *s)
{
switch(s->type->type) {
case TBitString :

14
lib/asn1/gen_length.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -41,13 +41,15 @@
RCSID("$Id$");
static void
length_primitive (char *typename, char *name, char *variable)
length_primitive (const char *typename,
const char *name,
const char *variable)
{
fprintf (codefile, "%s += length_%s(%s);\n", variable, typename, name);
}
static void
length_type (char *name, Type *t, char *variable)
length_type (const char *name, const Type *t, const char *variable)
{
switch (t->type) {
case TType:
@@ -137,15 +139,15 @@ length_type (char *name, Type *t, char *variable)
}
void
generate_type_length (Symbol *s)
generate_type_length (const Symbol *s)
{
fprintf (headerfile,
"size_t length_%s(%s *);\n",
"size_t length_%s(const %s *);\n",
s->gen_name, s->gen_name);
fprintf (codefile,
"size_t\n"
"length_%s(%s *data)\n"
"length_%s(const %s *data)\n"
"{\n"
"size_t ret = 0;\n",
s->gen_name, s->gen_name);

22
lib/asn1/gen_locl.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -57,16 +57,16 @@
#include "hash.h"
#include "symbol.h"
void generate_type (Symbol *);
void generate_constant (Symbol *);
void generate_type_encode (Symbol *s);
void generate_type_decode (Symbol *s);
void generate_seq_type_decode (Symbol *s);
void generate_type_free (Symbol *s);
void generate_type_length (Symbol *s);
void generate_type_copy (Symbol *s);
void generate_type_maybe (Symbol *s);
void generate_glue (Symbol *s);
void generate_type (const Symbol *);
void generate_constant (const Symbol *);
void generate_type_encode (const Symbol *s);
void generate_type_decode (const Symbol *s);
void generate_seq_type_decode (const Symbol *s);
void generate_type_free (const Symbol *s);
void generate_type_length (const Symbol *s);
void generate_type_copy (const Symbol *s);
void generate_type_maybe (const Symbol *s);
void generate_glue (const Symbol *s);
void init_generate (char *filename, char *basename);
void close_generate(void);

6
lib/krb5/addr_families.c
View File

@@ -105,7 +105,7 @@ ipv4_h_addr2sockaddr(const char *addr,
*sa_size = sizeof(*sin);
sin->sin_family = AF_INET;
sin->sin_port = port;
sin->sin_addr = *((struct in_addr *)addr);
sin->sin_addr = *((const struct in_addr *)addr);
}
static krb5_error_code
@@ -203,7 +203,7 @@ ipv6_sockaddr2addr (const struct sockaddr *sa, krb5_address *a)
#ifdef IN6_EXTRACT_V4ADDR
#define IN6_ADDR_V6_TO_V4(x) (&IN6_EXTRACT_V4ADDR(x))
#else
#define IN6_ADDR_V6_TO_V4(x) ((struct in_addr *)&(x)->s6_addr[12])
#define IN6_ADDR_V6_TO_V4(x) ((const struct in_addr *)&(x)->s6_addr[12])
#endif
#endif
memcpy (buf, IN6_ADDR_V6_TO_V4(&sin6->sin6_addr), 4);
@@ -252,7 +252,7 @@ ipv6_h_addr2sockaddr(const char *addr,
*sa_size = sizeof(*sin6);
sin6->sin6_family = AF_INET6;
sin6->sin6_port = port;
sin6->sin6_addr = *((struct in6_addr *)addr);
sin6->sin6_addr = *((const struct in6_addr *)addr);
}
static krb5_error_code

4
lib/krb5/cache.c
View File

@@ -98,7 +98,7 @@ allocate_ccache (krb5_context context,
p = malloc(sizeof(*p));
if(p == NULL)
return KRB5_CC_NOMEM;
p->ops = (krb5_cc_ops *)ops;
p->ops = ops;
*id = p;
ret = p->ops->resolve(context, id, residual);
if(ret)
@@ -150,7 +150,7 @@ krb5_cc_gen_new(krb5_context context,
p = malloc (sizeof(*p));
if (p == NULL)
return KRB5_CC_NOMEM;
p->ops = (krb5_cc_ops *)ops;
p->ops = ops;
*id = p;
return p->ops->gen_new(context, id);
}

8
lib/krb5/codec.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998 Kungliga Tekniska H<>gskolan
* Copyright (c) 1998 - 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -44,7 +44,7 @@ RCSID("$Id$");
converts the keytype to/from the on-the-wire enctypes */
#if 1
#define DECODE(T, K) return decode_ ## T((void*)data, length, t, len)
#define DECODE(T, K) return decode_ ## T(data, length, t, len)
#define ENCODE(T, K) return encode_ ## T(data, length, t, len)
#else
#define DECODE(T, K) \
@@ -177,7 +177,7 @@ krb5_decode_EncKrbCredPart (krb5_context context,
size_t *len)
{
#if 1
return decode_EncKrbCredPart((void*)data, length, t, len);
return decode_EncKrbCredPart(data, length, t, len);
#else
krb5_error_code ret;
int i;
@@ -218,7 +218,7 @@ krb5_decode_ETYPE_INFO (krb5_context context,
size_t *len)
{
#if 1
return decode_ETYPE_INFO((void*)data, length, t, len);
return decode_ETYPE_INFO(data, length, t, len);
#else
krb5_error_code ret;
int i;

6
lib/roken/base64.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 1996, 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1995 - 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -60,12 +60,12 @@ int base64_encode(const void *data, int size, char **str)
char *s, *p;
int i;
int c;
unsigned char *q;
const unsigned char *q;
p = s = (char*)malloc(size*4/3+4);
if (p == NULL)
return -1;
q = (unsigned char*)data;
q = (const unsigned char*)data;
i=0;
for(i = 0; i < size;){
c=q[i++];

2
lib/roken/net_write.c
View File

@@ -54,7 +54,7 @@ RCSID("$Id$");
ssize_t
net_write (int fd, const void *buf, size_t nbytes)
{
const char *cbuf = (char *)buf;
const char *cbuf = (const char *)buf;
ssize_t count;
size_t rem = nbytes;