Clean up "set but not used" GCC warnings

[onak.git] / charfuncs.c

diff --git a/charfuncs.c b/charfuncs.c
index 3bfc3cc5261018cfe4c104b348546777171ce4a2..fab53a2c89eaa360c7e6d2f20d8dfe4f458d48af 100644 (file)
--- a/charfuncs.c
+++ b/charfuncs.c
@@ -1,13 +1,24 @@
 /*
  * charfuncs.c - Routines for dealing with character streams.
  *
 /*
  * charfuncs.c - Routines for dealing with character streams.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * 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; version 2 of the License.

  *
  *

- * $Id: charfuncs.c,v 1.2 2003/06/04 20:57:07 noodles Exp $
+ * 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., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
  */
 

+#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>


@@ -20,17 +31,20 @@
  *     @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;

-       int i;

        
        buf = (struct buffer_ctx *) ctx;
        
        buf = (struct buffer_ctx *) ctx;

-       for (i = 0; i < count; i++) {
-               c[i] = buf->buffer[buf->offset++];
+
+       if (buf->offset + count > buf->size) {
+               return 1;

        }
        }

+       
+       memcpy(c, &buf->buffer[buf->offset], count);
+       buf->offset += count;

 
 

-       return (((buf->offset) == (buf->size)) ? 1 : 0);
+       return 0;

 }
 
 /**
 }
 
 /**


@@ -43,11 +57,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;

-       int i;

        
        buf = (struct buffer_ctx *) ctx;
 
        
        buf = (struct buffer_ctx *) ctx;
 


@@ -58,18 +71,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));
 }


@@ -77,7 +89,23 @@ 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));
 }

+
+/**
+ *     stdin_getchar - Gets a char from stdin.
+ */
+int stdin_getchar(void *ctx, size_t count, void *c)
+{
+       return (fread(c, 1, count, stdin) != count);
+}
+
+/**
+ *     stdout_putchar - Puts a char to stdout.
+ */
+int stdout_putchar(void *ctx, size_t count, void *c)
+{
+       return (fwrite(c, 1, count, stdout) != count);
+}