projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move over to log_assert.
[onak.git]
/
armor.c
diff --git
a/armor.c
b/armor.c
index ac1d23f44d1696ede71258dafde24f6b4086061d..6d3fc138f6bee1445f9ac9fea4a0f20139723468 100644
(file)
--- a/
armor.c
+++ b/
armor.c
@@
-6,11
+6,11
@@
* Copyright 2002 Project Purple
*/
* Copyright 2002 Project Purple
*/
-#include <assert.h>
#include <stdlib.h>
#include "armor.h"
#include "keystructs.h"
#include <stdlib.h>
#include "armor.h"
#include "keystructs.h"
+#include "log.h"
#include "onak-conf.h"
#include "parsekey.h"
#include "onak-conf.h"
#include "parsekey.h"
@@
-34,7
+34,7
@@
static unsigned char encode64(unsigned char c) {
} else if (c == 63) {
c = '/';
} else {
} else if (c == 63) {
c = '/';
} else {
- assert(c < 64);
+
log_
assert(c < 64);
}
return c;
}
return c;
@@
-142,7
+142,7
@@
static int armor_putchar_int(void *ctx, unsigned char c)
unsigned char t;
int i;
unsigned char t;
int i;
- assert(ctx != NULL);
+
log_
assert(ctx != NULL);
state = (struct armor_context *) ctx;
switch (state->curoctet++) {
state = (struct armor_context *) ctx;
switch (state->curoctet++) {
@@
-243,7
+243,7
@@
static int dearmor_getchar(void *ctx, unsigned char *c)
unsigned char tmpc;
int i;
unsigned char tmpc;
int i;
- assert(ctx != NULL);
+
log_
assert(ctx != NULL);
state = (struct dearmor_context *) ctx;
*c = 0;
state = (struct dearmor_context *) ctx;
*c = 0;