Mercurial > sdl-ios-xcode

diff src/video/wscons/SDL_wsconsvideo.c @ 1336:3692456e7b0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use SDL_ prefixed versions of C library functions. FIXME: Change #include <stdlib.h> to #include "SDL_stdlib.h" Change #include <string.h> to #include "SDL_string.h" Make sure nothing else broke because of this...
author Sam Lantinga <slouken@libsdl.org>
date Tue, 07 Feb 2006 06:59:48 +0000
parents c9b51268668f
children 604d73db6802
line wrap: on
line diff
--- a/src/video/wscons/SDL_wsconsvideo.c	Mon Feb 06 17:28:04 2006 +0000
+++ b/src/video/wscons/SDL_wsconsvideo.c	Tue Feb 07 06:59:48 2006 +0000
@@ -96,8 +96,8 @@
 
 static void WSCONS_DeleteDevice(SDL_VideoDevice *device)
 {
-  free(device->hidden);
-  free(device);
+  SDL_free(device->hidden);
+  SDL_free(device);
 }
 
 static SDL_VideoDevice *WSCONS_CreateDevice(int devindex)
@@ -105,20 +105,20 @@
   SDL_VideoDevice *device;
   
   /* Initialize all variables that we clean on shutdown */
-  device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice));
+  device = (SDL_VideoDevice *)SDL_malloc(sizeof(SDL_VideoDevice));
   if (device == NULL) {
     SDL_OutOfMemory();
     return 0;
   }
-  memset(device, 0, (sizeof *device));
+  SDL_memset(device, 0, (sizeof *device));
   device->hidden = 
-    (struct SDL_PrivateVideoData *)malloc((sizeof *device->hidden));
+    (struct SDL_PrivateVideoData *)SDL_malloc((sizeof *device->hidden));
   if (device->hidden == NULL) {
     SDL_OutOfMemory();
-    free(device);
+    SDL_free(device);
     return(0);
   }
-  memset(device->hidden, 0, (sizeof *device->hidden));
+  SDL_memset(device->hidden, 0, (sizeof *device->hidden));
   device->hidden->fd = -1;
   
   /* Set the function pointers */
@@ -159,7 +159,7 @@
   int pagemask;
   int width, height;
   
-  devname = getenv("SDL_WSCONSDEV");
+  devname = SDL_getenv("SDL_WSCONSDEV");
   if (devname == NULL) {
     int activeVT;
     if (ioctl(STDIN_FILENO, VT_GETACTIVE, &activeVT) == -1) {
@@ -167,7 +167,7 @@
 			 strerror(errno));
       return -1;
     }
-    snprintf(devnamebuf, sizeof(devnamebuf), WSCONSDEV_FORMAT, activeVT - 1);
+    SDL_snprintf(devnamebuf, sizeof(devnamebuf), WSCONSDEV_FORMAT, activeVT - 1);
     devname = devnamebuf;
   }
 
@@ -211,25 +211,25 @@
   }
   
   private->rotate = WSCONS_ROTATE_NONE;
-  rotation = getenv("SDL_VIDEO_WSCONS_ROTATION");
+  rotation = SDL_getenv("SDL_VIDEO_WSCONS_ROTATION");
   if (rotation != NULL) {
-    if (strlen(rotation) == 0) {
+    if (SDL_strlen(rotation) == 0) {
       private->shadowFB = 0;
       private->rotate = WSCONS_ROTATE_NONE;
       printf("Not rotating, no shadow\n");
-    } else if (!strcmp(rotation, "NONE")) {
+    } else if (!SDL_strcmp(rotation, "NONE")) {
       private->shadowFB = 1;
       private->rotate = WSCONS_ROTATE_NONE;
       printf("Not rotating, but still using shadow\n");
-    } else if (!strcmp(rotation, "CW")) {
+    } else if (!SDL_strcmp(rotation, "CW")) {
       private->shadowFB = 1;
       private->rotate = WSCONS_ROTATE_CW;
       printf("Rotating screen clockwise\n");
-    } else if (!strcmp(rotation, "CCW")) {
+    } else if (!SDL_strcmp(rotation, "CCW")) {
       private->shadowFB = 1;
       private->rotate = WSCONS_ROTATE_CCW;
       printf("Rotating screen counter clockwise\n");
-    } else if (!strcmp(rotation, "UD")) {
+    } else if (!SDL_strcmp(rotation, "UD")) {
       private->shadowFB = 1;
       private->rotate = WSCONS_ROTATE_UD;
       printf("Rotating screen upside down\n");
@@ -304,7 +304,7 @@
   }
 
   if (private->shadowFB) {
-    private->shadowmem = (Uint8 *)malloc(len);
+    private->shadowmem = (Uint8 *)SDL_malloc(len);
     if (private->shadowmem == NULL) {
       WSCONS_ReportError("No memory for shadow");
       return -1;
@@ -316,7 +316,7 @@
     private->fblinebytes = private->physlinebytes;
   }
   
-  private->SDL_modelist[0] = (SDL_Rect *)malloc(sizeof(SDL_Rect));
+  private->SDL_modelist[0] = (SDL_Rect *)SDL_malloc(sizeof(SDL_Rect));
   private->SDL_modelist[0]->w = width;
   private->SDL_modelist[0]->h = height;
 
@@ -374,7 +374,7 @@
   current->pitch = private->fblinebytes;
   current->pixels = private->fbstart;
 
-  memset(private->fbstart, 0, private->fbmem_len);
+  SDL_memset(private->fbstart, 0, private->fbmem_len);
 
   return current;
 }
@@ -583,7 +583,7 @@
   int mode = WSDISPLAYIO_MODE_EMUL;
 
   if (private->shadowmem != NULL) {
-    free(private->shadowmem);
+    SDL_free(private->shadowmem);
     private->shadowmem = NULL;
   }
   private->fbstart = NULL;
@@ -592,7 +592,7 @@
   }
 
   if (private->SDL_modelist[0] != NULL) {
-    free(private->SDL_modelist[0]);
+    SDL_free(private->SDL_modelist[0]);
     private->SDL_modelist[0] = NULL;
   }