These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / roms / ipxe / src / include / ipxe / linebuf.h

diff --git a/qemu/roms/ipxe/src/include/ipxe/linebuf.h b/qemu/roms/ipxe/src/include/ipxe/linebuf.h
index 706ef25..630278a 100644 (file)
--- a/qemu/roms/ipxe/src/include/ipxe/linebuf.h
+++ b/qemu/roms/ipxe/src/include/ipxe/linebuf.h
@@ -7,24 +7,24 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <stddef.h>
 
 /** A line buffer */
 struct line_buffer {
-       /** Current string in the buffer */
+       /** Data buffer */
        char *data;
-       /** Length of current string, excluding the terminating NUL */
+       /** Length of buffered data */
        size_t len;
-       /** String is ready to read */
-       int ready;
+       /** Most recently consumed length */
+       size_t consumed;
 };
 
 extern char * buffered_line ( struct line_buffer *linebuf );
-extern ssize_t line_buffer ( struct line_buffer *linebuf,
-                            const char *data, size_t len );
+extern int line_buffer ( struct line_buffer *linebuf,
+                        const char *data, size_t len );
 extern void empty_line_buffer ( struct line_buffer *linebuf );
 
 #endif /* _IPXE_LINEBUF_H */