summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/debug/textbuf.cpp
diff options
context:
space:
mode:
author Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
committer Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
commit2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch)
treeb468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/emu/debug/textbuf.cpp
parent077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff)
parent11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff)
Merge https://github.com/mamedev/mame
# Conflicts: # src/devices/video/ef9365.cpp
Diffstat (limited to 'src/emu/debug/textbuf.cpp')
-rw-r--r--src/emu/debug/textbuf.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/debug/textbuf.cpp b/src/emu/debug/textbuf.cpp
index 52fd669a997..e7daf96571a 100644
--- a/src/emu/debug/textbuf.cpp
+++ b/src/emu/debug/textbuf.cpp
@@ -50,7 +50,7 @@ struct text_buffer
currently held in the buffer
-------------------------------------------------*/
-INLINE INT32 buffer_used(text_buffer *text)
+static inline INT32 buffer_used(text_buffer *text)
{
INT32 used = text->bufend - text->bufstart;
if (used < 0)
@@ -64,7 +64,7 @@ INLINE INT32 buffer_used(text_buffer *text)
available in the buffer
-------------------------------------------------*/
-INLINE INT32 buffer_space(text_buffer *text)
+static inline INT32 buffer_space(text_buffer *text)
{
return text->bufsize - buffer_used(text);
}
@@ -88,14 +88,14 @@ text_buffer *text_buffer_alloc(UINT32 bytes, UINT32 lines)
/* allocate memory for the text buffer object */
text = (text_buffer *)global_alloc(text_buffer);
if (!text)
- return NULL;
+ return nullptr;
/* allocate memory for the buffer itself */
text->buffer = (char *)global_alloc_array(char, bytes);
if (!text->buffer)
{
global_free(text);
- return NULL;
+ return nullptr;
}
/* allocate memory for the lines array */
@@ -104,7 +104,7 @@ text_buffer *text_buffer_alloc(UINT32 bytes, UINT32 lines)
{
global_free_array(text->buffer);
global_free(text);
- return NULL;
+ return nullptr;
}
/* initialize the buffer description */
@@ -319,6 +319,6 @@ const char *text_buffer_get_seqnum_line(text_buffer *text, UINT32 seqnum)
UINT32 numlines = text_buffer_num_lines(text);
UINT32 index = seqnum - text->linestartseq;
if (index >= numlines)
- return NULL;
+ return nullptr;
return &text->buffer[text->lineoffs[(text->linestart + index) % text->linesize]];
}