Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-24 11:55:43 +00:00
Code Issues Releases Activity

* Fixed bug in libmpdclient that caused file descriptors to be left open.

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1080 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-03-30 01:23:04 +00:00
parent 70b9a1bf2e
commit 3efefaf182
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@
* Increased C99 compliance. * Increased C99 compliance.
* Fixed potential segfault in get_ioscheduler(). * Fixed potential segfault in get_ioscheduler().
* Implemented upwards path traversal for fs_type. * Implemented upwards path traversal for fs_type.
* Fixed bug in libmpdclient that caused file descriptors to be left open.
2008-03-28 2008-03-28
* Fixed messed up percentages (fs_free_perc, fs_used_perc, mpd_percent, * Fixed messed up percentages (fs_free_perc, fs_used_perc, mpd_percent,

8
src/libmpdclient.c
View File

@ -27,7 +27,11 @@
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id$
*
* */
#include "conky.h" #include "conky.h"
#include "libmpdclient.h" #include "libmpdclient.h"
@ -113,7 +117,7 @@ static int do_connect_fail(mpd_Connection *connection,
fcntl(connection->sock, F_SETFL, flags | O_NONBLOCK); fcntl(connection->sock, F_SETFL, flags | O_NONBLOCK);
return (connect(connection->sock, serv_addr, addrlen) < 0 return (connect(connection->sock, serv_addr, addrlen) < 0
&& errno != EINPROGRESS); || errno != EINPROGRESS);
} }
#endif /* !WIN32 */ #endif /* !WIN32 */

4
src/mpd.c
View File

@ -152,7 +152,7 @@ void *update_mpd(void *arg)
timed_thread_lock(mpd_timed_thread); timed_thread_lock(mpd_timed_thread);
if (current_info->conn->error || current_info->conn == NULL) { if (current_info->conn->error || current_info->conn == NULL) {
// ERR("%MPD error: s\n", current_info->conn->errorStr); ERR("MPD error: %s\n", current_info->conn->errorStr);
mpd_closeConnection(current_info->conn); mpd_closeConnection(current_info->conn);
current_info->conn = 0; current_info->conn = 0;
clear_mpd_stats(current_info); clear_mpd_stats(current_info);
@ -168,7 +168,7 @@ void *update_mpd(void *arg)
mpd_sendStatusCommand(current_info->conn); mpd_sendStatusCommand(current_info->conn);
if ((status = mpd_getStatus(current_info->conn)) == NULL) { if ((status = mpd_getStatus(current_info->conn)) == NULL) {
// ERR("MPD error: %s\n", current_info->conn->errorStr); ERR("MPD error: %s\n", current_info->conn->errorStr);
mpd_closeConnection(current_info->conn); mpd_closeConnection(current_info->conn);
current_info->conn = 0; current_info->conn = 0;
clear_mpd_stats(current_info); clear_mpd_stats(current_info);