Mercurial > pidgin
view src/gaim_buffer.c @ 13545:cfc2f7fcb3dd
[gaim-migrate @ 15922]
Way more changes that I initially thought I was going to make. I apologize
for the commit message spam. These changes bring a lot of consistency to
our capitalization and punctuation, especially of words like "e-mail".
For reference, I've used these rules (after discussing in #gaim):
e-mail, a case of two words joined:
"e-mail" - in the middle of a sentence caps context
"E-mail" - start of text in a sentence caps context
"E-Mail" - in a header (title) caps context
re-enable, a single word, would be:
"re-enable", "Re-enable", and "Re-enable" (respectively)
The reason this changeset exploded is that, as I went through and verified
these changes, I realized we were using improper capitalization (e.g. header
instead of sentence) in a number of dialogs. I fixed a number of these
cases before, and this corrects another pile.
This looks like I've made a LOT of work for the translators, but the impact
is significantly mitigated by three factors: 1) Many of these changes use
strings that already exist, or change one string in many places. 2) I've
used sed to correct the .po files where possible. 3) The actual changes
are extremely trivial.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 21 Mar 2006 04:32:45 +0000 |
| parents | 64bae3cbec8d |
| children | 71a6a6b22149 |
line wrap: on
line source
/* * @file gaim_buffer.h Buffer Utility Functions * @ingroup core * * Gaim is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * 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 * (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. * * 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 */ #include "internal.h" #include "gaim_buffer.h" #define DEFAULT_BUF_SIZE 256 GaimCircBuffer * gaim_circ_buffer_new(gsize growsize) { GaimCircBuffer *buf = g_new0(GaimCircBuffer, 1); buf->growsize = growsize ? growsize : DEFAULT_BUF_SIZE; return buf; } void gaim_circ_buffer_destroy(GaimCircBuffer *buf) { g_free(buf->buffer); g_free(buf); } static void grow_circ_buffer(GaimCircBuffer *buf, gsize len) { int in_offset = 0, out_offset = 0; int start_buflen = buf->buflen; while ((buf->buflen - buf->bufused) < len) buf->buflen += buf->growsize; if (buf->inptr != NULL) { in_offset = buf->inptr - buf->buffer; out_offset = buf->outptr - buf->buffer; } buf->buffer = g_realloc(buf->buffer, buf->buflen); /* adjust the fill and remove pointer locations */ if (buf->inptr == NULL) { buf->inptr = buf->outptr = buf->buffer; } else { buf->inptr = buf->buffer + in_offset; buf->outptr = buf->buffer + out_offset; } /* If the fill pointer is wrapped to before the remove * pointer, we need to shift the data */ if (in_offset < out_offset) { int shift_n = MIN(buf->buflen - start_buflen, in_offset); memcpy(buf->buffer + start_buflen, buf->buffer, shift_n); /* If we couldn't fit the wrapped read buffer * at the end */ if (shift_n < in_offset) { memmove(buf->buffer, buf->buffer + shift_n, in_offset - shift_n); buf->inptr = buf->buffer + (in_offset - shift_n); } else { buf->inptr = buf->buffer + start_buflen + in_offset; } } } void gaim_circ_buffer_append(GaimCircBuffer *buf, gconstpointer src, gsize len) { int len_stored; /* Grow the buffer, if necessary */ if ((buf->buflen - buf->bufused) < len) grow_circ_buffer(buf, len); /* If there is not enough room to copy all of src before hitting * the end of the buffer then we will need to do two copies. * One copy from inptr to the end of the buffer, and the * second copy from the start of the buffer to the end of src. */ if (buf->inptr >= buf->outptr) len_stored = MIN(len, buf->buflen - (buf->inptr - buf->buffer)); else len_stored = len; memcpy(buf->inptr, src, len_stored); if (len_stored < len) { memcpy(buf->buffer, src + len_stored, len - len_stored); buf->inptr = buf->buffer + (len - len_stored); } else if ((buf->buffer - buf->inptr) == len_stored) { buf->inptr = buf->buffer; } else { buf->inptr += len_stored; } buf->bufused += len; } gsize gaim_circ_buffer_get_max_read(GaimCircBuffer *buf) { int max_read; if (buf->bufused == 0) max_read = 0; else if ((buf->outptr - buf->inptr) >= 0) max_read = buf->buflen - (buf->outptr - buf->buffer); else max_read = buf->inptr - buf->outptr; return max_read; } gboolean gaim_circ_buffer_mark_read(GaimCircBuffer *buf, gsize len) { g_return_val_if_fail(gaim_circ_buffer_get_max_read(buf) >= len, FALSE); buf->outptr += len; buf->bufused -= len; /* wrap to the start if we're at the end */ if ((buf->outptr - buf->buffer) == buf->buflen) buf->outptr = buf->buffer; return TRUE; }
