links

Commit: 3a0535495ec086f1cbb93b8f00c9e450883b7ab5
Parent: c77dc5705e749d708843dd5c452fb4ca009b5969
Author: opask
Date:   Sun, 22 Jul 2018 20:49:13 -0600

remove mem_free from img.c, jpeg.c, kbd.c, and language.c

Diffstat:
M
img.c
 | 
71
+++++++++++++++++++++++++++++++++--------------------------------------
M
jpeg.c
 | 
10
+++++-----
M
kbd.c
 | 
30
+++++++++++++++---------------
M
language.c
 | 
14
+++++++-------

4 files changed, 60 insertions(+), 65 deletions(-)
diff --git a/img.c b/img.c
@@ -29,7 +29,6 @@ static int is_image_size_sane(int x, int y)
 	return a < MAXINT;
 }
 
-/* mem_free(cimg->decoder) */
 static void destroy_decoder (struct cached_image *cimg)
 {
 	if (cimg->decoder){
@@ -46,30 +45,30 @@ static void destroy_decoder (struct cached_image *cimg)
 			gif_destroy_decoder(cimg);
 			break;
 		}
-		mem_free(cimg->decoder);
+		free(cimg->decoder);
 	}
 }
 
 static void mem_free_buffer(struct cached_image *cimg)
 {
-	mem_free(cimg->buffer);
+	free(cimg->buffer);
 }
 
 static void img_destruct_image(struct g_object *object)
 {
 	struct g_object_image *goi = get_struct(object, struct g_object_image, goti.go);
 
-	if (goi->orig_src) mem_free(goi->orig_src);
-	if (goi->alt) mem_free(goi->alt);
-	if (goi->name) mem_free(goi->name);
-	if (goi->src) mem_free(goi->src);
+	free(goi->orig_src);
+	free(goi->alt);
+	free(goi->name);
+	free(goi->src);
 	release_image_map(goi->goti.map);
 	if (goi->list_entry.next) del_from_list(goi);
 	if (goi->goti.go.xw && goi->goti.go.yw) {
 		 /* At least one dimension is zero */
 		goi->cimg->refcount--;
 	}
-	mem_free(goi);
+	free(goi);
 }
 
 /* Frees all data allocated by cached_image including cached image itself */
@@ -86,15 +85,14 @@ void img_destruct_cached_image(struct cached_image *cimg)
 
 		case 12:
 		case 14:
-		if (cimg->gamma_table) mem_free(cimg->gamma_table);
+		free(cimg->gamma_table);
 		if (cimg->bmp_used){
 			drv->unregister_bitmap(&(cimg->bmp));
 		}
-		if (cimg->strip_optimized){
-			if (cimg->dregs) mem_free(cimg->dregs);
-		}else{
+		if (cimg->strip_optimized) {
+			free(cimg->dregs);
+		} else
 			mem_free_buffer(cimg);
-		}
 		/*-fallthrough*/
 		case 8:
 		case 10:
@@ -112,8 +110,8 @@ void img_destruct_cached_image(struct cached_image *cimg)
 		internal("Invalid state in struct cached_image");
 #endif /* #ifdef DEBUG */
 	}
-	mem_free(cimg->url);
-	mem_free(cimg);
+	free(cimg->url);
+	free(cimg);
 }
 
 /* You throw in a vertical dimension of image and it returns
@@ -317,7 +315,7 @@ int header_dimensions_known(struct cached_image *cimg)
 				(*round_fn)(buf_16,&tmpbmp);
 				tmpbmp.data=(unsigned char *)tmpbmp.data+cimg->bmp.skip;
 			}
-		mem_free(buf_16);
+		free(buf_16);
 		skip_img:
 		drv->register_bitmap(&(cimg->bmp));
 		if(cimg->dregs) memset(cimg->dregs,0,cimg->width*sizeof(*cimg->dregs)*3);
@@ -549,7 +547,7 @@ not_enough:
 	 */
 	goto not_enough;
 end:
-	mem_free(tmp);
+	free(tmp);
 	if (!use_strip) drv->register_bitmap(&(cimg->bmp));
 }
 
@@ -630,8 +628,8 @@ buffer_to_bitmap");
 		}
 		buffer_to_bitmap_incremental(cimg, cimg->buffer, cimg->height,
 			0, dregs, 0);
-		if (dregs) mem_free(dregs);
-	}else{
+		free(dregs);
+	} else {
 		if (tmp) {
 			if (dither_images)
 				dither(tmp,&(cimg->bmp));
@@ -663,14 +661,13 @@ void img_end(struct cached_image *cimg)
 	switch(cimg->state){
 		case 12:
 		case 14:
-		if (cimg->strip_optimized){
-		       if (cimg->dregs)	mem_free(cimg->dregs);
-		}
-		else{
+		if (cimg->strip_optimized)
+		       free(cimg->dregs);
+		else {
 			buffer_to_bitmap(cimg);
 			mem_free_buffer(cimg);
 		}
-		if (cimg->gamma_table) mem_free(cimg->gamma_table);
+		free(cimg->gamma_table);
 		/*-fallthrough*/
 		case 8:
 		case 10:
@@ -712,14 +709,13 @@ static void r3l0ad(struct cached_image *cimg, struct g_object_image *goi)
 		break;
 
 		case 12:
-		if (cimg->gamma_table) mem_free(cimg->gamma_table);
+		free(cimg->gamma_table);
 		destroy_decoder(cimg);
-		if (cimg->strip_optimized){
-			if (cimg->dregs) mem_free(cimg->dregs);
-		}else{
+		if (cimg->strip_optimized)
+			free(cimg->dregs);
+		else
 			mem_free_buffer(cimg);
-		}
-		if (cimg->bmp_used){
+		if (cimg->bmp_used) {
 			case 13:
 			drv->unregister_bitmap(&cimg->bmp);
 		}
@@ -728,14 +724,13 @@ static void r3l0ad(struct cached_image *cimg, struct g_object_image *goi)
 		break;
 
 		case 14:
-		if (cimg->gamma_table) mem_free(cimg->gamma_table);
+		free(cimg->gamma_table);
 		destroy_decoder(cimg);
-		if (cimg->strip_optimized){
-			if (cimg->dregs) mem_free(cimg->dregs);
-		}else{
+		if (cimg->strip_optimized)
+			free(cimg->dregs);
+		else
 			mem_free_buffer(cimg);
-		}
-		if (cimg->bmp_used){
+		if (cimg->bmp_used) {
 			case 15:
 			drv->unregister_bitmap(&cimg->bmp);
 		}
@@ -847,7 +842,7 @@ static int img_process_download(struct g_object_image *goi, struct f_data_c *fda
 			goi->af->rq->url);
 		if (!ctype) ctype = stracpy(cast_uchar "application/octet-stream");
 		type(cimg,ctype,data);
-		mem_free(ctype);
+		free(ctype);
 	}
 
 	/* Now, if we are in state where decoder is running (8, 10, 12, 14), we may feed
@@ -1192,7 +1187,7 @@ struct g_object_image *insert_image(struct g_part *p, struct image_description *
 	}
 	if (image->goti.go.xw >= 0 && image->goti.go.yw >= 0) {
 		if (!is_image_size_sane(image->goti.go.xw, image->goti.go.yw)) {
-			mem_free(image);
+			free(image);
 			return NULL;
 		}
 	}
diff --git a/jpeg.c b/jpeg.c
@@ -89,8 +89,8 @@ void jpeg_start(struct cached_image *cimg)
 	global_jerr->pub.output_message=my_output_message;
 	if (setjmp(global_jerr->setjmp_buffer)){
 g19_2000:
-		mem_free(global_cinfo);
-		mem_free(global_jerr);
+		free(global_cinfo);
+		free(global_jerr);
 		img_end(cimg);
 		return;
 	}
@@ -396,9 +396,9 @@ void jpeg_destroy_decoder(struct cached_image *cimg)
 {
 	struct jpg_decoder *deco = (struct jpg_decoder *)cimg->decoder;
 	jpeg_destroy_decompress(deco->cinfo);
-	mem_free(deco->cinfo);
-	mem_free(deco->jerr);
-	if (deco->jdata) mem_free(deco->jdata);
+	free(deco->cinfo);
+	free(deco->jerr);
+	free(deco->jdata);
 }
 
 void add_jpeg_version(unsigned char **s, int *l)
diff --git a/kbd.c b/kbd.c
@@ -335,7 +335,7 @@ void handle_trm(int std_in, int std_out, int sock_in, int sock_out, int ctl_in, 
 		queue_event(itrm, ts, (int)strlen(cast_const_char ts));
 		mm = mem_calloc(ll);
 		queue_event(itrm, mm, ll);
-		mem_free(mm);
+		free(mm);
 	}
 	if (!(ts = get_cwd())) ts = stracpy(cast_uchar "");
 	if (strlen(cast_const_char ts) >= MAX_CWD_LEN) queue_event(itrm, ts, MAX_CWD_LEN);
@@ -345,9 +345,9 @@ void handle_trm(int std_in, int std_out, int sock_in, int sock_out, int ctl_in, 
 		queue_event(itrm, ts, (int)strlen(cast_const_char ts));
 		mm = mem_calloc(ll);
 		queue_event(itrm, mm, ll);
-		mem_free(mm);
+		free(mm);
 	}
-	mem_free(ts);
+	free(ts);
 	queue_event(itrm, (unsigned char *)&xwin, sizeof(int));
 	def_charset = get_default_charset();
 	queue_event(itrm, (unsigned char *)&def_charset, sizeof(int));
@@ -400,7 +400,8 @@ static void free_trm(struct itrm *itrm)
 {
 	if (!itrm) return;
 	set_window_title(itrm->orig_title);
-	if (itrm->orig_title) mem_free(itrm->orig_title), itrm->orig_title = NULL;
+	free(itrm->orig_title);
+	itrm->orig_title = NULL;
 	unhandle_terminal_resize(itrm->ctl_in);
 	if (itrm->mouse_h) unhandle_mouse(itrm->mouse_h);
 	send_term_sequence(itrm->std_out, itrm->flags);
@@ -411,8 +412,8 @@ static void free_trm(struct itrm *itrm)
 	set_handlers(itrm->sock_out, NULL, NULL, NULL);
 	unregister_bottom_half(itrm_error, itrm);
 	if (itrm->tm != NULL) kill_timer(itrm->tm);
-	mem_free(itrm->ev_queue);
-	mem_free(itrm);
+	free(itrm->ev_queue);
+	free(itrm);
 	if (itrm == ditrm) ditrm = NULL;
 }
 
@@ -453,8 +454,8 @@ do {								\
 	unsigned char cc;					\
 	if (p < c) cc = buf[p++];				\
 	else if ((hard_read(itrm->sock_in, &cc, 1)) <= 0) {	\
-		mem_free(path);					\
-		mem_free(delet);				\
+		free(path);					\
+		free(delet);					\
 		goto fr;					\
 	}							\
 	xx = cc;						\
@@ -528,19 +529,18 @@ static void in_sock(void *itrm_)
 		if (fg == 1) block_itrm(0);
 		if ((blockh = start_thread(exec_thread, param, (int)strlen(cast_const_char path) + (int)strlen(cast_const_char delet) + 3, *delet != 0)) == -1) {
 			if (fg == 1) unblock_itrm(0);
-			mem_free(param);
+			free(param);
 			goto to_je_ale_hnus;
 		}
-		mem_free(param);
-		if (fg == 1) {
+		free(param);
+		if (fg == 1)
 			set_handlers(blockh, unblock_itrm_x, NULL, (void *)(my_intptr_t)blockh);
-		} else {
+		else
 			set_handlers(blockh, close_handle, NULL, (void *)(my_intptr_t)blockh);
-		}
 	}
 	to_je_ale_hnus:
-	mem_free(path);
-	mem_free(delet);
+	free(path);
+	free(delet);
 	memmove(buf, buf + p, c - p);
 	c -= p;
 	goto qwerty;
diff --git a/language.c b/language.c
@@ -38,9 +38,9 @@ void shutdown_trans(void)
 			unsigned char *txt = translation_array[j][k];
 			if (txt &&
 			    txt != cast_uchar translation_english[k].name)
-				mem_free(txt);
+				free(txt);
 		}
-		mem_free(translation_array[j]);
+		free(translation_array[j]);
 	}
 }
 
@@ -62,17 +62,17 @@ search_again:
 	p = stracpy(p);
 	p[strcspn(cast_const_char p, ",;")] = 0;
 	if (!casestrcmp(lang, p)) {
-		mem_free(p);
-		mem_free(lang);
+		free(p);
+		free(lang);
 		return 0;
 	}
-	mem_free(p);
+	free(p);
 
 	if ((p = cast_uchar strchr(cast_const_char lang, '-'))) {
 		*p = 0;
 		goto search_again;
 	}
-	mem_free(lang);
+	free(lang);
 	return -1;
 }
 
@@ -140,7 +140,7 @@ unsigned char *get_text_translation(unsigned char *text, struct terminal *term)
 			l_opt.cp = charset;
 			trn = convert(current_lang_charset, charset, tt, &l_opt);
 			if (!strcmp(cast_const_char trn, cast_const_char tt)) {
-				mem_free(trn);
+				free(trn);
 				trn = tt;
 			}
 		}