[tuxdroid-svn] r227 - svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct daemon/trunk daemon/trunk/libs

[svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...>]

Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 227

Modified:
   
   
   
   daemon/trunk/libs/USBDaemon_globals.h
   daemon/trunk/main.c
Log:
neimad
2007-04-09 10:29:36 +0200 (Mon, 09 Apr 2007)
173
* Defined types and constants for maturity and release_status
  fields of struct version_s.

* Replaced hardcoded maturity and release_status lengths with
  their sizeof().


svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: daemon/trunk/libs/USBDaemon_globals.h
===================================================================
--- daemon/trunk/libs/USBDaemon_globals.h	2007-04-08 19:41:43 UTC (rev 226)
+++ daemon/trunk/libs/USBDaemon_globals.h	2007-04-09 08:29:36 UTC (rev 227)
@@ -38,13 +38,20 @@
 extern unsigned char SHOW_RAW_STATUS;
 extern unsigned short DAEMON_PID;
 extern unsigned char SHOW_INVALID_RAW;
+
+#define MATURITY_LEN        9
+typedef char maturity_t[MATURITY_LEN + 1];
+
+#define RELEASE_STATUS_LEN  19
+typedef char release_status_t[RELEASE_STATUS_LEN + 1];
+
 struct version_s
 {
     int major;
     int minor;
     int release;
-    char maturity[10];
-    char release_status[20];
+    maturity_t maturity;
+    release_status_t release_status;
     int revision;
 };
 extern struct version_s version;

Modified: daemon/trunk/main.c
===================================================================
--- daemon/trunk/main.c	2007-04-08 19:41:43 UTC (rev 226)
+++ daemon/trunk/main.c	2007-04-09 08:29:36 UTC (rev 227)
@@ -40,7 +40,15 @@
 
 /*_____________________ F U N C T I O N S __________________________________*/
 
-struct version_s version = {0, 0, 0, "\0", "\0", 0};
+struct version_s version =
+{
+    .major = 0,
+    .minor = 0,
+    .release = 0,
+    .maturity = "",
+    .release_status = "",
+    .revision = 0
+};
 unsigned char SHOW_FRAMES = 0;
 unsigned char SHOW_RAW_STATUS = 0;
 unsigned char SHOW_INVALID_RAW = 0;
@@ -63,9 +71,9 @@
     if ((token = strtok(NULL, delimiters)) != NULL)
         version.release = atoi(token);
     if ((token = strtok(NULL, delimiters)) != NULL)
-        strncpy(version.maturity, token, 10);
+        strncpy(version.maturity, token, sizeof(version.maturity));
     if ((token = strtok(NULL, delimiters)) != NULL)
-        strncpy(version.release_status, token, 20);
+        strncpy(version.release_status, token, sizeof(version.release_status));
 
     printf("-----------------------------------\n");
     printf("Tux USB Daemon version %s\n", VERSION);
@@ -89,9 +97,9 @@
 static int fd_nullify (int desired_fd)
 {
     int fd;
-    int fd2; 
+    int fd2;
     int saved_errno;
-    
+
     close (desired_fd);
     fd = open ("/dev/null", O_WRONLY, S_IRUSR | S_IWUSR);
     if (fd == desired_fd || fd < 0)
@@ -103,7 +111,7 @@
         errno = saved_errno;
         return fd2;
     }
-} 
+}
 
 /************************************************************************ */
 /* Daemonizer */