From 4033ff94080a86428e994d8245303fd627e756e8 Mon Sep 17 00:00:00 2001 From: Ali Gholami Rudi Date: Sun, 21 Dec 2014 17:16:20 +0330 Subject: [PATCH] scrsnap: clean up scr_snap() and scr_load() --- scrsnap.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/scrsnap.c b/scrsnap.c index 1f0d93a..ba0952c 100644 --- a/scrsnap.c +++ b/scrsnap.c @@ -1,7 +1,6 @@ #include #include #include "draw.h" -#include "fbpad.h" #define NSCRS 128 @@ -11,14 +10,11 @@ void scr_snap(int idx) { int rowsz = FBM_BPP(fb_mode()) * fb_cols(); int i; - if (idx >= NSCRS) - return; - if (!scrs[idx]) + if (idx < NSCRS && !scrs[idx]) scrs[idx] = malloc(fb_rows() * rowsz); - if (!scrs[idx]) - return; - for (i = 0; i < fb_rows(); i++) - memcpy(scrs[idx] + i * rowsz, fb_mem(i), rowsz); + if (idx < NSCRS && scrs[idx]) + for (i = 0; i < fb_rows(); i++) + memcpy(scrs[idx] + i * rowsz, fb_mem(i), rowsz); } void scr_free(int idx) @@ -33,16 +29,15 @@ int scr_load(int idx) { int rowsz = FBM_BPP(fb_mode()) * fb_cols(); int i; - if (idx >= NSCRS || !scrs[idx]) - return -1; - for (i = 0; i < fb_rows(); i++) - memcpy(fb_mem(i), scrs[idx] + i * rowsz, rowsz); + if (idx < NSCRS && scrs[idx]) + for (i = 0; i < fb_rows(); i++) + memcpy(fb_mem(i), scrs[idx] + i * rowsz, rowsz); return 0; } void scr_done(void) { int i; - for (i = 0; i < LEN(scrs); i++) + for (i = 0; i < NSCRS; i++) free(scrs[i]); } -- 2.11.4.GIT