/*
* This file is part of DisOrder
- * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007-9, 2013 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file lib/hex.c @brief Hexadecimal encoding and decoding */
-#include <config.h>
-#include "types.h"
-
-#include <stdio.h>
-#include <string.h>
+#include "common.h"
#include "hex.h"
#include "mem.h"
#include "log.h"
+#include "printf.h"
/** @brief Convert a byte sequence to hex
* @param ptr Pointer to first byte
char *buf = xmalloc_noptr(n * 2 + 1), *p = buf;
while(n-- > 0)
- p += sprintf(p, "%02x", (unsigned)*ptr++);
+ p += byte_snprintf(p, 3, "%02x", (unsigned)*ptr++);
*p = 0;
return buf;
}
int unhexdigit(int c) {
int d;
- if((d = unhexdigitq(c)) < 0) error(0, "invalid hex digit");
+ if((d = unhexdigitq(c)) < 0)
+ disorder_error(0, "invalid hex digit");
return d;
}
int d1, d2;
if((l = strlen(s)) & 1) {
- error(0, "hex string has odd length");
+ disorder_error(0, "hex string has odd length");
return 0;
}
p = buf = xmalloc_noptr(l / 2);