Bug#322641: FTBFS: Missing braces around an ambiguous else

2005-08-15 Thread David Eriksson
On Thu, 2005-08-11 at 11:19 -0700, Matt Kraai wrote:

 [snip]

 The attached patch eliminates the warnings, which allows the build to
 succeed.

This has already been corrected upstream.

-- 
Regards,
   -\- David Eriksson -/-

SynCE - http://synce.sourceforge.net
  ScummVM - http://scummvm.sourceforge.net
 Desquirr - http://desquirr.sourceforge.net



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#322641: FTBFS: Missing braces around an ambiguous else

2005-08-11 Thread Matt Kraai
Package: librra
Version: 0.9.0-2
Severity: serious
Tags: patch

librra fails to build because it has some code that generates warnings
which are treated as errors:

 if /bin/sh ../libtool --mode=compile i486-linux-gnu-gcc -DHAVE_CONFIG_H -I. 
 -I. -I..-g -Wall -Wsign-compare -Wno-long-long -Werror -ansi -g -O2 -I.. 
 -g -O2 -MT appointment.lo -MD -MP -MF .deps/appointment.Tpo \
   -c -o appointment.lo `test -f 'appointment.c' || echo './'`appointment.c; \
 then mv -f .deps/appointment.Tpo .deps/appointment.Plo; \
 else rm -f .deps/appointment.Tpo; exit 1; \
 fi
 mkdir .libs
  i486-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I. -I.. -g -Wall -Wsign-compare 
 -Wno-long-long -Werror -ansi -g -O2 -I.. -g -O2 -MT appointment.lo -MD -MP 
 -MF .deps/appointment.Tpo -c appointment.c  -fPIC -DPIC -o .libs/appointment.o
 cc1: warnings being treated as errors
 appointment.c: In function 'rra_appointment_from_vevent':
 appointment.c:668: warning: suggest explicit braces to avoid ambiguous 'else'

The attached patch eliminates the warnings, which allows the build to
succeed.

-- 
Matt
only in patch2:
unchanged:
--- librra-0.9.0.orig/lib/appointment.c
+++ librra-0.9.0/lib/appointment.c
@@ -666,6 +666,7 @@
 synce_warning(Failed to parse recurrence rule);
 
   if (event_parser_data.uid)
+  {
 if (0 == strncmp(event_parser_data.uid-values[0], BLOB0067_STR, 
strlen(BLOB0067_STR)))
 {
   /* A binary UID from SynCE */
@@ -694,6 +695,7 @@
   (uint8_t*)event_parser_data.uid-values[0], 
   strlen(event_parser_data.uid-values[0]));
 }
+  }
 }
 else
 #endif
only in patch2:
unchanged:
--- librra-0.9.0.orig/lib/common_handlers.c
+++ librra-0.9.0/lib/common_handlers.c
@@ -203,7 +203,8 @@
 strbuf_append_c(note, *q);
 }
 
-success = parser_add_blob(p, ID_NOTES, note-buffer, note-length);
+success = parser_add_blob(p, ID_NOTES, (uint8_t *)note-buffer,
+ note-length);
 
 if (parser_utf8(p))
   free(source);


signature.asc
Description: Digital signature