mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

picview/png, my_popen: fix -Wclobbered warnings

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 283a6c30eb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-01-26 19:30:23 +01:00
parent 06a7d16bf8
commit dd41d82ef5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/driver/pictureviewer/png.cpp
View File

@@ -32,7 +32,7 @@ int int_png_load(const char *name, unsigned char **buffer, int* xp, int* yp, int
png_infop info_ptr; png_infop info_ptr;
png_uint_32 width, height; png_uint_32 width, height;
unsigned int i; unsigned int i;
int bit_depth, color_type, interlace_type, number_passes, pass, int_bpp = 3; int bit_depth, color_type, interlace_type, number_passes, pass, int_bpp;
png_byte * fbptr; png_byte * fbptr;
FILE * fh; FILE * fh;
@@ -96,6 +96,7 @@ int int_png_load(const char *name, unsigned char **buffer, int* xp, int* yp, int
png_set_strip_alpha(png_ptr); png_set_strip_alpha(png_ptr);
if (bit_depth < 8) if (bit_depth < 8)
png_set_packing(png_ptr); png_set_packing(png_ptr);
int_bpp = 3;
} }
if (bit_depth == 16) if (bit_depth == 16)
png_set_strip_16(png_ptr); png_set_strip_16(png_ptr);

6
src/system/helpers.cpp
View File

@@ -4,7 +4,7 @@
License: GPL License: GPL
(C) 2012-2013 the neutrino-hd developers (C) 2012-2013 the neutrino-hd developers
(C) 2012,2013 Stefan Seyfried (C) 2012-2015 Stefan Seyfried
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -112,7 +112,7 @@ int my_system(const char * cmd)
int my_system(int argc, const char *arg, ...) int my_system(int argc, const char *arg, ...)
{ {
int i = 0, ret = 0, childExit = 0; int i = 0, ret, childExit = 0;
#define ARGV_MAX 64 #define ARGV_MAX 64
/* static right now but could be made dynamic if necessary */ /* static right now but could be made dynamic if necessary */
int argv_max = ARGV_MAX; int argv_max = ARGV_MAX;
@@ -143,6 +143,7 @@ int my_system(int argc, const char *arg, ...)
ret = -errno; ret = -errno;
break; break;
case 0: /* child process */ case 0: /* child process */
ret = 0;
for(i = 3; i < maxfd; i++) for(i = 3; i < maxfd; i++)
close(i); close(i);
if (setsid() == -1) if (setsid() == -1)
@@ -155,6 +156,7 @@ int my_system(int argc, const char *arg, ...)
} }
_exit(ret); // terminate c h i l d proces s only _exit(ret); // terminate c h i l d proces s only
default: /* parent returns to calling process */ default: /* parent returns to calling process */
ret = 0;
waitpid(pid, &childExit, 0); waitpid(pid, &childExit, 0);
if (WEXITSTATUS(childExit) != 0) if (WEXITSTATUS(childExit) != 0)
ret = (signed char)WEXITSTATUS(childExit); ret = (signed char)WEXITSTATUS(childExit);