ardour/livetrax
13
0
Fork 0
Code

Coding style. Fix a valgrind warning. Stop a close on a handle of -1.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5493 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-08-04 22:01:28 +00:00
parent 7ccb2f8689
commit 9c6449567d
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libs/surfaces/powermate/powermate.cc
View File

@ -33,35 +33,41 @@ static const char *valid_prefix[NUM_VALID_PREFIXES] = {
#define NUM_EVENT_DEVICES 16 #define NUM_EVENT_DEVICES 16
int open_powermate(const char *dev, int mode) int open_powermate (const char *dev, int mode)
{ {
if (!Glib::file_test (dev, Glib::FILE_TEST_EXISTS)) { if (!Glib::file_test (dev, Glib::FILE_TEST_EXISTS)) {
return -1; return -1;
} }
int fd = open(dev, mode); int fd = open(dev, mode);
int i; int i;
char name[255]; char name[255];
if(fd < 0){ if (fd < 0) {
if (errno != EACCES) { if (errno != EACCES) {
error << string_compose ("Unable to open \"%1\": %2", dev, strerror(errno)) << endmsg; error << string_compose ("Unable to open \"%1\": %2", dev, strerror(errno)) << endmsg;
} }
return -1; return -1;
} }
if(ioctl(fd, EVIOCGNAME(sizeof(name)), name) < 0){ /* placate valgrind */
error << string_compose ("\"%1\": EVIOCGNAME failed: %2", dev, strerror(errno)) << endmsg; name[0] = '\0';
close(fd);
return -1;
}
// it's the correct device if the prefix matches what we expect it to be: if (ioctl (fd, EVIOCGNAME (sizeof(name)), name) < 0) {
for(i=0; i<NUM_VALID_PREFIXES; i++) error << string_compose ("\"%1\": EVIOCGNAME failed: %2", dev, strerror(errno)) << endmsg;
if(!strncasecmp(name, valid_prefix[i], strlen(valid_prefix[i]))) close (fd);
return fd; return -1;
}
close(fd); // it's the correct device if the prefix matches what we expect it to be:
return -1; for (i = 0; i < NUM_VALID_PREFIXES; ++i) {
if (!strncasecmp (name, valid_prefix[i], strlen (valid_prefix[i]))) {
return fd;
}
}
close (fd);
return -1;
} }
int find_powermate(int mode) int find_powermate(int mode)
@ -96,7 +102,6 @@ PowermateControlProtocol::probe ()
if (port < 0) { if (port < 0) {
printf ("powermate: Opening of powermate failed - %s\n", strerror(errno)); printf ("powermate: Opening of powermate failed - %s\n", strerror(errno));
close (port);
return false; return false;
} }