gwj / at91sam9263 · Commits

Commit 8906428682bf2e4f60ea7d5fa98f75fde9194106

Authored by aliguori
1 parent fb437313

Move buffer functions up (Alexander Graf) 

We will need to use buffer functions in code that will end up being
below the current buffer functions. In order to not introduce any
function stub defines, let's just move them up.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6497 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 33 additions and 33 deletions
... ... @@ -263,6 +263,39 @@ static void vnc_framebuffer_update(VncState *vs, int x, int y, int w, int h,
263 263 vnc_write_s32(vs, encoding);
264 264 }
265 265  
  266 +static void buffer_reserve(Buffer *buffer, size_t len)
  267 +{
  268 + if ((buffer->capacity - buffer->offset) < len) {
  269 + buffer->capacity += (len + 1024);
  270 + buffer->buffer = qemu_realloc(buffer->buffer, buffer->capacity);
  271 + if (buffer->buffer == NULL) {
  272 + fprintf(stderr, "vnc: out of memory\n");
  273 + exit(1);
  274 + }
  275 + }
  276 +}
  277 +
  278 +static int buffer_empty(Buffer *buffer)
  279 +{
  280 + return buffer->offset == 0;
  281 +}
  282 +
  283 +static uint8_t *buffer_end(Buffer *buffer)
  284 +{
  285 + return buffer->buffer + buffer->offset;
  286 +}
  287 +
  288 +static void buffer_reset(Buffer *buffer)
  289 +{
  290 + buffer->offset = 0;
  291 +}
  292 +
  293 +static void buffer_append(Buffer *buffer, const void *data, size_t len)
  294 +{
  295 + memcpy(buffer->buffer + buffer->offset, data, len);
  296 + buffer->offset += len;
  297 +}
  298 +
266 299 static void vnc_dpy_resize(DisplayState *ds)
267 300 {
268 301 int size_changed;
... ... @@ -598,39 +631,6 @@ static int vnc_listen_poll(void *opaque)
598 631 return 0;
599 632 }
600 633  
601   -static void buffer_reserve(Buffer *buffer, size_t len)
602   -{
603   - if ((buffer->capacity - buffer->offset) < len) {
604   - buffer->capacity += (len + 1024);
605   - buffer->buffer = qemu_realloc(buffer->buffer, buffer->capacity);
606   - if (buffer->buffer == NULL) {
607   - fprintf(stderr, "vnc: out of memory\n");
608   - exit(1);
609   - }
610   - }
611   -}
612   -
613   -static int buffer_empty(Buffer *buffer)
614   -{
615   - return buffer->offset == 0;
616   -}
617   -
618   -static uint8_t *buffer_end(Buffer *buffer)
619   -{
620   - return buffer->buffer + buffer->offset;
621   -}
622   -
623   -static void buffer_reset(Buffer *buffer)
624   -{
625   - buffer->offset = 0;
626   -}
627   -
628   -static void buffer_append(Buffer *buffer, const void *data, size_t len)
629   -{
630   - memcpy(buffer->buffer + buffer->offset, data, len);
631   - buffer->offset += len;
632   -}
633   -
634 634 /* audio */
635 635 static void audio_capture_notify(void *opaque, audcnotification_e cmd)
636 636 {
... ...