projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused keydb_dynamic.h header file
[onak.git]
/
charfuncs.c
diff --git
a/charfuncs.c
b/charfuncs.c
index c8a140ff2ff45686cac6804c522a83e033a70e62..fea0a99cf0081218b831794b55dc8db599e31176 100644
(file)
--- a/
charfuncs.c
+++ b/
charfuncs.c
@@
-7,6
+7,7
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
@@
-19,15
+20,14
@@
* @count: The number of characters to get from the buffer.
* @c: Where to put the characters retrieved.
*/
* @count: The number of characters to get from the buffer.
* @c: Where to put the characters retrieved.
*/
-int buffer_fetchchar(void *ctx, size_t count,
unsigned char
*c)
+int buffer_fetchchar(void *ctx, size_t count,
void
*c)
{
struct buffer_ctx *buf = NULL;
{
struct buffer_ctx *buf = NULL;
- size_t i;
buf = (struct buffer_ctx *) ctx;
buf = (struct buffer_ctx *) ctx;
- for (i = 0; i < count; i++) {
-
c[i] = buf->buffer[buf->offset++]
;
- }
+
+
memcpy(c, &buf->buffer[buf->offset], count)
;
+ buf->offset += count;
return (((buf->offset) == (buf->size)) ? 1 : 0);
}
return (((buf->offset) == (buf->size)) ? 1 : 0);
}
@@
-42,11
+42,10
@@
int buffer_fetchchar(void *ctx, size_t count, unsigned char *c)
* fill it then we double the size of the current buffer and then add the
* rest.
*/
* fill it then we double the size of the current buffer and then add the
* rest.
*/
-int buffer_putchar(void *ctx, size_t count,
unsigned char
*c)
+int buffer_putchar(void *ctx, size_t count,
void
*c)
{
struct buffer_ctx *buf = NULL;
size_t newsize = 0;
{
struct buffer_ctx *buf = NULL;
size_t newsize = 0;
- size_t i;
buf = (struct buffer_ctx *) ctx;
buf = (struct buffer_ctx *) ctx;
@@
-57,18
+56,17
@@
int buffer_putchar(void *ctx, size_t count, unsigned char *c)
buf->buffer = realloc(buf->buffer, newsize);
buf->size = newsize;
}
buf->buffer = realloc(buf->buffer, newsize);
buf->size = newsize;
}
-
- for (i = 0; i < count; i++) {
- buf->buffer[buf->offset++] = c[i];
- }
+ memcpy(&buf->buffer[buf->offset], c, count);
+ buf->offset += count;
+
return 1;
}
/**
* file_fetchchar - Fetches a char from a file.
*/
return 1;
}
/**
* file_fetchchar - Fetches a char from a file.
*/
-int file_fetchchar(void *fd, size_t count,
unsigned char
*c)
+int file_fetchchar(void *fd, size_t count,
void
*c)
{
return !(read( *(int *) fd, c, count));
}
{
return !(read( *(int *) fd, c, count));
}
@@
-76,7
+74,7
@@
int file_fetchchar(void *fd, size_t count, unsigned char *c)
/**
* file_putchar - Puts a char to a file.
*/
/**
* file_putchar - Puts a char to a file.
*/
-int file_putchar(void *fd, size_t count,
unsigned char
*c)
+int file_putchar(void *fd, size_t count,
void
*c)
{
return !(write( *(int *) fd, c, count));
}
{
return !(write( *(int *) fd, c, count));
}
@@
-84,7
+82,7
@@
int file_putchar(void *fd, size_t count, unsigned char *c)
/**
* stdin_getchar - Gets a char from stdin.
*/
/**
* stdin_getchar - Gets a char from stdin.
*/
-int stdin_getchar(void *ctx, size_t count,
unsigned char
*c)
+int stdin_getchar(void *ctx, size_t count,
void
*c)
{
return (fread(c, 1, count, stdin) != count);
}
{
return (fread(c, 1, count, stdin) != count);
}
@@
-92,7
+90,7
@@
int stdin_getchar(void *ctx, size_t count, unsigned char *c)
/**
* stdout_putchar - Puts a char to stdout.
*/
/**
* stdout_putchar - Puts a char to stdout.
*/
-int stdout_putchar(void *ctx, size_t count,
unsigned char
*c)
+int stdout_putchar(void *ctx, size_t count,
void
*c)
{
return (fwrite(c, 1, count, stdout) != count);
}
{
return (fwrite(c, 1, count, stdout) != count);
}