diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-26 15:01:37 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-26 15:01:37 +0000 |
commit | b63759b175cf9ddd9735ca0d2f803fe62f69c3c3 (patch) | |
tree | a583febda46545afc4ed20ccbdbed0ae3165a5c4 /libvo | |
parent | fad137d7fe3bfef6a258518a1e86a4d811d3b4b5 (diff) | |
download | mpv-b63759b175cf9ddd9735ca0d2f803fe62f69c3c3.tar.bz2 mpv-b63759b175cf9ddd9735ca0d2f803fe62f69c3c3.tar.xz |
Do not cast the results of malloc/calloc/realloc.
These functions return void*, which is compatible with any pointer,
so there is no need for casts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/sub.c | 12 | ||||
-rw-r--r-- | libvo/video_out.c | 2 | ||||
-rw-r--r-- | libvo/vo_fbdev2.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index 79780ce974..b7e9ccdd6b 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -726,7 +726,7 @@ inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){ render_one_glyph(sub_font, c); if (c == ' ') { - struct osd_text_t *tmp_ott = (struct osd_text_t *) calloc(1, sizeof(struct osd_text_t)); + struct osd_text_t *tmp_ott = calloc(1, sizeof(struct osd_text_t)); if (osl == NULL) { osl = cp_ott = tmp_ott; @@ -739,7 +739,7 @@ inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){ } tmp_ott->osd_length = xsize; tmp_ott->text_length = char_position; - tmp_ott->text = (int *) malloc(char_position * sizeof(int)); + tmp_ott->text = malloc(char_position * sizeof(int)); for (counter = 0; counter < char_position; ++counter) tmp_ott->text[counter] = char_seq[counter]; char_position = 0; @@ -769,7 +769,7 @@ inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){ // osl holds an ordered (as they appear in the lines) chain of the subtitle words { - struct osd_text_t *tmp_ott = (struct osd_text_t *) calloc(1, sizeof(struct osd_text_t)); + struct osd_text_t *tmp_ott = calloc(1, sizeof(struct osd_text_t)); if (osl == NULL) { osl = cp_ott = tmp_ott; @@ -782,7 +782,7 @@ inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){ } tmp_ott->osd_length = xsize; tmp_ott->text_length = char_position; - tmp_ott->text = (int *) malloc(char_position * sizeof(int)); + tmp_ott->text = malloc(char_position * sizeof(int)); for (counter = 0; counter < char_position; ++counter) tmp_ott->text[counter] = char_seq[counter]; char_position = 0; @@ -794,7 +794,7 @@ inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){ int value = 0, exit = 0, minimum = 0; // otp will contain the chain of the osd subtitle lines coming from the single vo_sub line. - otp = tmp_otp = (struct osd_text_p *) calloc(1, sizeof(struct osd_text_p)); + otp = tmp_otp = calloc(1, sizeof(struct osd_text_p)); tmp_otp->ott = osl; for (tmp_ott = tmp_otp->ott; exit == 0; ) { do { @@ -802,7 +802,7 @@ inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){ tmp_ott = tmp_ott->next; } while ((tmp_ott != NULL) && (value + tmp_ott->osd_kerning + tmp_ott->osd_length <= xlimit)); if (tmp_ott != NULL) { - struct osd_text_p *tmp = (struct osd_text_p *) calloc(1, sizeof(struct osd_text_p)); + struct osd_text_p *tmp = calloc(1, sizeof(struct osd_text_p)); tmp_otp->value = value; tmp_otp->next = tmp; diff --git a/libvo/video_out.c b/libvo/video_out.c index b285458c87..d721e0a526 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -482,7 +482,7 @@ range_t *str2range(char *s) for (i = 0; *endptr; i++) { if (*s == ',') goto out_err; - if (!(r = (range_t *) realloc(r, sizeof(*r) * (i + 2)))) { + if (!(r = realloc(r, sizeof(*r) * (i + 2)))) { mp_msg(MSGT_GLOBAL, MSGL_WARN,"can't realloc 'r'\n"); return NULL; } diff --git a/libvo/vo_fbdev2.c b/libvo/vo_fbdev2.c index 55527a660c..0e8f3743cd 100644 --- a/libvo/vo_fbdev2.c +++ b/libvo/vo_fbdev2.c @@ -300,7 +300,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, ( (out_height - in_height) / 2 ) * fb_line_len; #ifndef USE_CONVERT2FB - if (!(next_frame = (uint8_t *) realloc(next_frame, in_width * in_height * fb_pixel_size))) { + if (!(next_frame = realloc(next_frame, in_width * in_height * fb_pixel_size))) { mp_msg(MSGT_VO, MSGL_ERR, "[fbdev2] Can't malloc next_frame: %s\n", strerror(errno)); return 1; } |