Changeset 153a209 in mainline for fb/ega.c

Timestamp:

2006-06-16T21:13:55Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

501a8ba

Parents:

a46da63

Message:

Some cleanups. Martin…try make clean;make…

File:

• fb/ega.c (modified) (5 diffs)

fb/ega.c

@@ -159 +159 @@
 {
         int i;
-        short *mem;
-        for (i=0 ;( i < MAX_SAVED_SCREENS ) && (saved_screens[i].data); i++);
+
+        for (i=0; ( i < MAX_SAVED_SCREENS ) && (saved_screens[i].data); i++)
+                ;
         if (i == MAX_SAVED_SCREENS) 
                 return EINVAL;
         if (!(saved_screens[i].data=malloc( 2 * scr_width*scr_height ))) 
                 return ENOMEM;
-        memcpy (saved_screens[i].data ,scr_addr ,2 * scr_width * scr_height)
-                ;
+        memcpy(saved_screens[i].data, scr_addr, 2 * scr_width * scr_height);
+
         return i;
 }
@@ -173 +174 @@
 {
         if (saved_screens[i].data)
-                        memcpy (scr_addr,saved_screens[i].data, 2 * scr_width * scr_height);
+                memcpy(scr_addr, saved_screens[i].data, 2 * scr_width * scr_height);
         else return EINVAL;
         return i;
@@ -209 +210 @@
                         intersize = IPC_GET_ARG2(call);
                         if (intersize >= scr_width*scr_height*sizeof(*interbuf)) {
-                                receive_comm_area(callid,&call,(void **)&interbuf);
+                                receive_comm_area(callid,&call,(void *)&interbuf);
                                 continue;
                         }
@@ -270 +271 @@
                         bgcolor = IPC_GET_ARG2(call);
                         style = EGA_STYLE(fgcolor, bgcolor);
+                        retval = 0;
                         break;
                 case FB_VP_DRAW_PIXMAP:
@@ -288 +290 @@
                                 saved_screens[i].data = NULL;
                         }
+                        retval = 0;
                         break;