projects
/
dos_imgv
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check alloc
[dos_imgv]
/
src
/
video.c
diff --git
a/src/video.c
b/src/video.c
index
9c77bba
..
91f09f3
100644
(file)
--- a/
src/video.c
+++ b/
src/video.c
@@
-6,6
+6,7
@@
#include "vbe.h"
#include "vga.h"
#include "util.h"
#include "vbe.h"
#include "vga.h"
#include "util.h"
+#include "chkalloc.h"
#ifdef __WATCOMC__
#include <i86.h>
#ifdef __WATCOMC__
#include <i86.h>
@@
-61,7
+62,7
@@
int init_video(void)
num_vmodes = 0;
max_modes = 256;
num_vmodes = 0;
max_modes = 256;
- if(!(vmodes = malloc(max_modes * sizeof *vmodes))) {
+ if(!(vmodes = chk_malloc(max_modes * sizeof *vmodes))) {
fprintf(stderr, "failed to allocate video modes list\n");
return -1;
}
fprintf(stderr, "failed to allocate video modes list\n");
return -1;
}
@@
-76,9
+77,9
@@
int init_video(void)
if(num_vmodes >= max_modes) {
int newmax = max_modes ? (max_modes << 1) : 16;
if(num_vmodes >= max_modes) {
int newmax = max_modes ? (max_modes << 1) : 16;
- if(!(vmptr = realloc(vmodes, newmax * sizeof *vmodes))) {
+ if(!(vmptr = chk_realloc(vmodes, newmax * sizeof *vmodes))) {
fprintf(stderr, "failed to grow video mode list (%d)\n", newmax);
fprintf(stderr, "failed to grow video mode list (%d)\n", newmax);
- free(vmodes);
+ chk_free(vmodes);
return -1;
}
vmodes = vmptr;
return -1;
}
vmodes = vmptr;
@@
-123,7
+124,7
@@
int init_video(void)
void cleanup_video(void)
{
void cleanup_video(void)
{
- free(vmodes);
+ chk_free(vmodes);
}
struct video_mode *video_modes(void)
}
struct video_mode *video_modes(void)
@@
-394,7
+395,7
@@
void set_msr(uint32_t msr, uint32_t low, uint32_t high);
parm [ecx][eax][edx]
#endif /* __WATCOMC__ */
parm [ecx][eax][edx]
#endif /* __WATCOMC__ */
-
+
#define MSR_MTRRCAP 0xfe
#define MSR_MTRRDEFTYPE 0x2ff
#define MSR_MTRRCAP 0xfe
#define MSR_MTRRDEFTYPE 0x2ff