mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

harmonize coding style and messages

Browse Source
This commit is contained in:
marschap
2006-04-08 17:36:05 +00:00
parent a92603f96e
commit 57a5944a88
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/lircin.c
+5 -3
View File
@@ -71,7 +71,7 @@ lircin_init (Driver *drvthis)
/* Alocate and store private data */
p = (PrivateData *) malloc(sizeof(PrivateData));
if( ! p ) {
if (p == NULL) {
report(RPT_ERR, "%s: Could not allocate private data.", drvthis->name);
return -1;
}
@@ -89,11 +89,12 @@ lircin_init (Driver *drvthis)
/* READ CONFIG FILE:*/
/* Get location of lircrc to be used */
if (drvthis->config_get_string ( drvthis->name , "lircrc" , 0 , NULL) != NULL)
if (drvthis->config_get_string(drvthis->name, "lircrc", 0 , NULL) != NULL) {
strncpy(s, drvthis->config_get_string(drvthis->name, "lircrc", 0, ""), sizeof(s));
s[sizeof(s)-1] = '\0';
}
if (*s != '\0') {
s[sizeof(s)-1] = '\0';
p->lircrc = malloc(strlen(s) + 1);
if (p->lircrc == NULL) {
report(RPT_ERR, "%s: Could not allocate new memory.", drvthis->name);
@@ -144,6 +145,7 @@ lircin_init (Driver *drvthis)
}
fcntl (p->lircin_fd, F_SETFD, FD_CLOEXEC);
report(RPT_DEBUG, "%s: init() done", drvthis->name);
return 0;
}