Re: [ANNOUNCE] VDR developer version 1.3.47

Message ID 44442458.7060002@users.sourceforge.net
State New
Headers

Commit Message

Lucian Muresan April 17, 2006, 11:27 p.m. UTC
  Hi,

attached is an update for the romanian strings.

Lucian
Common subdirectories: vdr-1.3.47_orig/PLUGINS and vdr-1.3.47/PLUGINS
  

Comments

Christian Wieninger April 21, 2006, 9:43 a.m. UTC | #1
Hi,

beneath notice and sorry if already known, but:

g++ -fPIC -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD 
-DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE 
-DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\"  recording.c
recording.c: In constructor 'cIndexFile::cIndexFile(const char*, bool)':
recording.c:1200: warning: format '%d' expects type 'int', but argument 
3 has type 'long unsigned int'


gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)


BR,

Christian
  
Klaus Schmidinger April 22, 2006, 10:17 a.m. UTC | #2
Christian Wieninger wrote:
> Hi,
> 
> beneath notice and sorry if already known, but:
> 
> g++ -fPIC -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD 
> -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE 
> -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\"  recording.c
> recording.c: In constructor 'cIndexFile::cIndexFile(const char*, bool)':
> recording.c:1200: warning: format '%d' expects type 'int', but argument 
> 3 has type 'long unsigned int'
> 
> 
> gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)

Strange... I have the same compiler version here

kls@hawk:/home/kls/vdr/VDR > g++ -v
Using built-in specs.
Target: i586-suse-linux
Configured with: ../configure --enable-threads=posix --prefix=/usr --with-local-prefix=/usr/local --infodir=/usr/share/info --mandir=/usr/share/man --libdir=/usr/lib --libexecdir=/usr/lib --enable-languages=c,c++,objc,f95,java,ada --disable-checking --with-gxx-include-dir=/usr/include/c++/4.0.2 
--enable-java-awt=gtk --disable-libjava-multilib --with-slibdir=/lib --with-system-zlib --enable-shared --enable-__cxa_atexit --without-system-libunwind --host=i586-suse-linux
Thread model: posix
gcc version 4.0.2 20050901 (prerelease) (SUSE Linux)


but I don't get that warning.
I could change it to "%u" (which makes sense, since the value is
actually unsigned), but when I change it to "%lu" I get

g++ -fPIC -g -O2 -Wall -Woverloaded-virtual -c -DREMOTE_KBD -DLIRC_DEVICE=\"/dev/lircd\" -DRCU_DEVICE=\"/dev/ttyS1\" -D_GNU_SOURCE -DVIDEODIR=\"/video\" -DPLUGINDIR=\"./PLUGINS/lib\"  recording.c
recording.c: In constructor 'cIndexFile::cIndexFile(const char*, bool)':
recording.c:1200: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'unsigned int'


Just in case, my kernel version is

Linux hawk 2.6.13-15.8-default #1 Fri Feb 10 16:26:01 CET 2006 i686 i686 i386 GNU/Linux


I'm not sure what to make of this...

Klaus
  
Christian Wieninger April 22, 2006, 2:43 p.m. UTC | #3
Am Samstag, 22. April 2006 12:17 schrieb Klaus Schmidinger:
> Strange... I have the same compiler version here

I just notice, that I also don't get the warning on a machine at home, where I 
run the same system and compiler. The warning occures on a machine at office, 
where I just did a quick compile test. The only difference between the two 
systems is, that the office machine runs the 64-bit edition of Suse 10, while 
at home it's the 32-bit edition. Perhaps that's the reason.

> I'm not sure what to make of this...

perhaps nothing ;-)

Christian
  
Reinhard Nissl April 22, 2006, 7:50 p.m. UTC | #4
Hi,

Christian Wieninger wrote:

>> Strange... I have the same compiler version here

Me, too ;-)

> I just notice, that I also don't get the warning on a machine at home, where I 
> run the same system and compiler. The warning occures on a machine at office, 
> where I just did a quick compile test. The only difference between the two 
> systems is, that the office machine runs the 64-bit edition of Suse 10, while 
> at home it's the 32-bit edition. Perhaps that's the reason.

It is.

>> I'm not sure what to make of this...
> 
> perhaps nothing ;-)

I've got a report of a similar warning in vdr-xine. I suggest this solution:

esyslog("ERROR: can't allocate %ld bytes for index '%s'", (long)(size * 
sizeof(tIndex)), fileName);

Bye.
  
Klaus Schmidinger April 22, 2006, 8:47 p.m. UTC | #5
Reinhard Nissl wrote:
> Hi,
> 
> Christian Wieninger wrote:
> 
>>> Strange... I have the same compiler version here
> 
> 
> Me, too ;-)
> 
>> I just notice, that I also don't get the warning on a machine at home, 
>> where I run the same system and compiler. The warning occures on a 
>> machine at office, where I just did a quick compile test. The only 
>> difference between the two systems is, that the office machine runs 
>> the 64-bit edition of Suse 10, while at home it's the 32-bit edition. 
>> Perhaps that's the reason.
> 
> 
> It is.
> 
>>> I'm not sure what to make of this...
>>
>>
>> perhaps nothing ;-)
> 
> 
> I've got a report of a similar warning in vdr-xine. I suggest this 
> solution:
> 
> esyslog("ERROR: can't allocate %ld bytes for index '%s'", (long)(size * 
> sizeof(tIndex)), fileName);

To be honest, I don't like this.
Shouldn't this work on both 32- and 64bit systems without the need of
typecasting?

Klaus
  
Anssi Hannula April 22, 2006, 10:27 p.m. UTC | #6
Klaus Schmidinger wrote:
> Reinhard Nissl wrote:
> 
>>
>> I've got a report of a similar warning in vdr-xine. I suggest this
>> solution:
>>
>> esyslog("ERROR: can't allocate %ld bytes for index '%s'", (long)(size
>> * sizeof(tIndex)), fileName);
> 
> 
> To be honest, I don't like this.
> Shouldn't this work on both 32- and 64bit systems without the need of
> typecasting?

The return type of sizeof() is size_t. The size of size_t is
implementation-defined. With GCC that's unsigned int on ix86 and
unsigned long on x86_64.
  
Klaus Schmidinger April 23, 2006, 8:43 a.m. UTC | #7
Anssi Hannula wrote:
> Klaus Schmidinger wrote:
> 
>>Reinhard Nissl wrote:
>>
>>
>>>I've got a report of a similar warning in vdr-xine. I suggest this
>>>solution:
>>>
>>>esyslog("ERROR: can't allocate %ld bytes for index '%s'", (long)(size
>>>* sizeof(tIndex)), fileName);
>>
>>
>>To be honest, I don't like this.
>>Shouldn't this work on both 32- and 64bit systems without the need of
>>typecasting?
> 
> 
> The return type of sizeof() is size_t. The size of size_t is
> implementation-defined. With GCC that's unsigned int on ix86 and
> unsigned long on x86_64.

Does this mean that one would have to use different conversion
specifiers on 32- and 64bit systems? Sounds like a compiler bug
to me, because the source code should compile corretcly on both
systems...

Klaus
  
Werner Schweer April 23, 2006, 9:21 a.m. UTC | #8
On Sunday 23 April 2006 10:43, Klaus Schmidinger wrote:
> Anssi Hannula wrote:
> > Klaus Schmidinger wrote:
> >>Reinhard Nissl wrote:
> >>>I've got a report of a similar warning in vdr-xine. I suggest this
> >>>solution:
> >>>
> >>>esyslog("ERROR: can't allocate %ld bytes for index '%s'", (long)(size
> >>>* sizeof(tIndex)), fileName);
> >>
> >>To be honest, I don't like this.
> >>Shouldn't this work on both 32- and 64bit systems without the need of
> >>typecasting?
> >
> > The return type of sizeof() is size_t. The size of size_t is
> > implementation-defined. With GCC that's unsigned int on ix86 and
> > unsigned long on x86_64.
>
> Does this mean that one would have to use different conversion
> specifiers on 32- and 64bit systems? Sounds like a compiler bug
> to me, because the source code should compile corretcly on both
> systems...

"man fprintf" says there is a special "z" length modifier for size_t
arguments, so "...%zd..." should do the trick

/Werner
  
Gerald Raaf April 23, 2006, 9:35 a.m. UTC | #9
Am Sonntag, 23. April 2006 11:21 schrieb Werner Schweer:
> On Sunday 23 April 2006 10:43, Klaus Schmidinger wrote:
> > Anssi Hannula wrote:
> > > Klaus Schmidinger wrote:
> > >>Reinhard Nissl wrote:
> > >>>I've got a report of a similar warning in vdr-xine. I suggest this
> > >>>solution:
> > >>>
> > >>>esyslog("ERROR: can't allocate %ld bytes for index '%s'", (long)(size
> > >>>* sizeof(tIndex)), fileName);
> > >>
> > >>To be honest, I don't like this.
> > >>Shouldn't this work on both 32- and 64bit systems without the need of
> > >>typecasting?
> > >
> > > The return type of sizeof() is size_t. The size of size_t is
> > > implementation-defined. With GCC that's unsigned int on ix86 and
> > > unsigned long on x86_64.
> >
> > Does this mean that one would have to use different conversion
> > specifiers on 32- and 64bit systems? Sounds like a compiler bug
> > to me, because the source code should compile corretcly on both
> > systems...
>
> "man fprintf" says there is a special "z" length modifier for size_t
> arguments, so "...%zd..." should do the trick

"...%zd..." can be used, no compile error on a 64bit only system and 32bit 
system.

Gerald

>
> /Werner
>
>
> _______________________________________________
> vdr mailing list
> vdr@linuxtv.org
> http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
  

Patch

diff -u vdr-1.3.47_orig/i18n.c vdr-1.3.47/i18n.c
--- vdr-1.3.47_orig/i18n.c	2006-04-15 16:13:45.000000000 +0200
+++ vdr-1.3.47/i18n.c	2006-04-18 01:20:40.000000000 +0200
@@ -472,7 +472,7 @@ 
     "Este evento - %s",
     "",//TODO
     "Ta audycja - %s",
-    "",//TODO
+    "Aceastã emisiune - %s",
     "",//TODO
     "",//TODO
     "ÍâÐ ßÕàÕÔÐçÐ - %s",
@@ -494,7 +494,7 @@ 
     "Este evento - todos los canales",
     "",//TODO
     "Ta audycja - wszystkie kana³y",
-    "",//TODO
+    "Aceastã emisiune - toate canalele",
     "",//TODO
     "",//TODO
     "ÍâÐ ßÕàÕÔÐçÐ - ÒáÕ ÚÐÝÐÛë",
@@ -516,7 +516,7 @@ 
     "Todos los eventos - todos los canales",
     "",//TODO
     "Wszystkie audycje - wszystkie kana³y",
-    "",//TODO
+    "Toate emisiunile - toate canalele",
     "",//TODO
     "",//TODO
     "²áÕ ßÕàÕÔÐçØ - ÒáÕ ÚÐÝÐÛë",
@@ -693,7 +693,7 @@ 
     "Programa",
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Timer",
     "",// TODO
     "",// TODO
     "ÂÐÙÜÕà",
@@ -847,7 +847,7 @@ 
     "Continuar",
     "ÅðáíáöïñÜ",
     "Fortsätt",
-    "Revenire",
+    "Continuare",
     "Tovább",
     "Continuar",
     "¿àÞÔÞÛÖØâì",
@@ -1685,7 +1685,7 @@ 
     "en abierto",
     "",//TODO
     "otwarty przekaz",
-    "",//TODO
+    "FTA (necriptat)",
     "",//TODO
     "",//TODO
     "FTA (ÝÕ×ÐÚÞÔØàÞÒÐÝÞ)",
@@ -1707,7 +1707,7 @@ 
     "cifrado",
     "",//TODO
     "szyfrowany",
-    "",//TODO
+    "criptat",
     "",//TODO
     "",//TODO
     "×ÐÚÞÔØàÞÒÐÝÞ",
@@ -1861,7 +1861,7 @@ 
     "Transmisión",
     "ÌåôÜäïóç",
     "Transmission",
-    "Transmisiune",
+    "Transmisie",
     "Transmission",
     "Transmissió",
     "¿ÕàÕÔÐçÐ",
@@ -2281,7 +2281,7 @@ 
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Urmeazã o înregistrare VPS!",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -2501,7 +2501,7 @@ 
     "",//TODO
     "",//TODO
     "",//TODO
-    "",//TODO
+    "Insuficient spaþiul pe disc pentru înregistrare!",
     "",//TODO
     "",//TODO
     "œÕÔÞáâÐâÞçÝÞ ÜÕáâÐ ÝÐ ÔØáÚÕ ÔÛï ÝÐçÐÛÐ ×ÐßØáØ",
@@ -2545,7 +2545,7 @@ 
     "Abriendo el menú CAM...",
     "",//TODO
     "Åßóïäïò CAM Ìåíïý",
-    "",//TODO
+    "Deschid meniul CAM...",
     "",//TODO
     "",//TODO
     "ŸâÚàëÒÐî ÜÕÝî ÜÞÔãÛï ãáÛÞÒÝÞÓÞ ÔÞáâãßÐ (CAM)",
@@ -2589,7 +2589,7 @@ 
     "Reiniciando CAM...",
     "",//TODO
     "ÅðáíáöïñÜ CAM",
-    "",//TODO
+    "Se reseteazã CAM...",
     "",//TODO
     "",//TODO
     "¿ÕàÕÓàã×ÚÐ CAM...",
@@ -2655,7 +2655,7 @@ 
     "¡Escriba %d dígitos!",
     "",//TODO
     "Ðáñáêáëü ðëçêôñïëïãÞóåôå %d íïýìåñá",
-    "",//TODO
+    "Vã rog introduceþi %d cifre!",
     "",//TODO
     "",//TODO
     "œÐÖÜØâÕ %d æØäàë",
@@ -3273,7 +3273,7 @@ 
     "Auto-cerrar al solicitar info de canal",
     "", // TODO
     "", // TODO
-    "", // TODO
+    "Durata afiºãrii informaþii canal",
     "", // TODO
     "", // TODO
     "žÝäÞàÜÐæØî Þ ÚÐÝÐÛÕ ×ÐÚàëâì",
@@ -3339,7 +3339,7 @@ 
     "Cerrar al pulsar botón de menú",
     "",// TODO
     "Klawisz Menu zamyka",
-    "",// TODO
+    "Tasta 'Meniu' închide",
     "",// TODO
     "",// TODO
     "ºÝÞßÚã ŒÕÝî ×ÐÚàëâì",
@@ -3735,7 +3735,7 @@ 
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Numai PID-uri",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4461,7 +4461,7 @@ 
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Canalul de pornire",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4483,7 +4483,7 @@ 
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Volumul la pornire",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4505,7 +4505,7 @@ 
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "ca mai înainte",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -4596,7 +4596,7 @@ 
     " 0\t-.#~,/_@1\tabcáç2\tdefé3\tghií4\tjkl5\tmnoñó6\tpqrs7\ttuvú8\twxyz9",
     "",//TODO
     "",//TODO
-    "",//TODO
+    " 0\t-.#~,/_@1\taãâbc2\tdef3\tghiî4\tjkl5\tmno6\tpqrsº7\ttþuv8\twxyz9",
     "",//TODO
     "",//TODO
     "",//TODO
@@ -5324,7 +5324,7 @@ 
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Urmãtor",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5346,7 +5346,7 @@ 
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Anterior",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5434,7 +5434,7 @@ 
     "",// TODO
     "",// TODO
     "",// TODO
-    "",// TODO
+    "Canal anterior",
     "",// TODO
     "",// TODO
     "",// TODO
@@ -5963,7 +5963,7 @@ 
     "Iniciando grabación",
     "",//TODO
     "",//TODO
-    "",//TODO
+    "A început înregistrarea",
     "",//TODO
     "",//TODO
     "·ÐßØáì ÝÐçÐâÐ",