[maemo-commits] [maemo-commits] r18674 - in projects/haf/trunk/osso-af-utils: . debian src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Jun 9 11:58:32 EEST 2009
- Previous message: [maemo-commits] r18673 - projects/haf/trunk/osso-af-utils
- Next message: [maemo-commits] r18675 - projects/haf/tags/osso-af-utils
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: schulhof
Date: 2009-06-09 11:58:30 +0300 (Tue, 09 Jun 2009)
New Revision: 18674
Modified:
projects/haf/trunk/osso-af-utils/Makefile.am
projects/haf/trunk/osso-af-utils/Makefile.in
projects/haf/trunk/osso-af-utils/configure
projects/haf/trunk/osso-af-utils/configure.in
projects/haf/trunk/osso-af-utils/debian/changelog
projects/haf/trunk/osso-af-utils/debian/control
projects/haf/trunk/osso-af-utils/debian/rules
projects/haf/trunk/osso-af-utils/src/fb-progress.c
projects/haf/trunk/osso-af-utils/src/fb-progress.sh
projects/haf/trunk/osso-af-utils/src/xset770.c
Log:
A bunch of changes
Modified: projects/haf/trunk/osso-af-utils/Makefile.am
===================================================================
--- projects/haf/trunk/osso-af-utils/Makefile.am 2009-06-09 08:56:03 UTC (rev 18673)
+++ projects/haf/trunk/osso-af-utils/Makefile.am 2009-06-09 08:58:30 UTC (rev 18674)
@@ -1,2 +1,2 @@
-SUBDIRS = src scripts
+SUBDIRS = src
Modified: projects/haf/trunk/osso-af-utils/Makefile.in
===================================================================
--- projects/haf/trunk/osso-af-utils/Makefile.in 2009-06-09 08:56:03 UTC (rev 18673)
+++ projects/haf/trunk/osso-af-utils/Makefile.in 2009-06-09 08:58:30 UTC (rev 18674)
@@ -141,7 +141,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = src scripts
+SUBDIRS = src
all: all-recursive
.SUFFIXES:
Modified: projects/haf/trunk/osso-af-utils/configure
===================================================================
--- projects/haf/trunk/osso-af-utils/configure 2009-06-09 08:56:03 UTC (rev 18673)
+++ projects/haf/trunk/osso-af-utils/configure 2009-06-09 08:58:30 UTC (rev 18674)
@@ -3211,7 +3211,7 @@
fi
-ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -3807,7 +3807,6 @@
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
Modified: projects/haf/trunk/osso-af-utils/configure.in
===================================================================
--- projects/haf/trunk/osso-af-utils/configure.in 2009-06-09 08:56:03 UTC (rev 18673)
+++ projects/haf/trunk/osso-af-utils/configure.in 2009-06-09 08:58:30 UTC (rev 18674)
@@ -1,5 +1,5 @@
AC_INIT(src/waitdbus.c)
AM_INIT_AUTOMAKE(waitdbus, 1.0)
AC_PROG_CC
-AC_OUTPUT(Makefile src/Makefile scripts/Makefile)
+AC_OUTPUT(Makefile src/Makefile)
Modified: projects/haf/trunk/osso-af-utils/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-utils/debian/changelog 2009-06-09 08:56:03 UTC (rev 18673)
+++ projects/haf/trunk/osso-af-utils/debian/changelog 2009-06-09 08:58:30 UTC (rev 18674)
@@ -1,3 +1,12 @@
+osso-af-utils (2.7-1) unstable; urgency=low
+
+ * Installing tmp-reaper by dh_installxsession
+ Fixes: NB#103382 - File /etc/X11/Xsession.post/41tmp-reaper should be part
+ of the osso-af-utils package
+ * Fixes: NB#109884 - Coverity findings in osso-af-utils
+
+ -- Viktor Nagy <vik at garage.maemo.org> Fri, 05 Jun 2009 16:48:17 +0200
+
osso-af-utils (2.6-1) unstable; urgency=low
* A patch from Mox to modify the progress thingy
Modified: projects/haf/trunk/osso-af-utils/debian/control
===================================================================
--- projects/haf/trunk/osso-af-utils/debian/control 2009-06-09 08:56:03 UTC (rev 18673)
+++ projects/haf/trunk/osso-af-utils/debian/control 2009-06-09 08:58:30 UTC (rev 18674)
@@ -2,7 +2,7 @@
Section: base
Priority: optional
Maintainer: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, libx11-dev, libdbus-1-dev (>= 0.60), libosso-dev, libxsp-dev, libpng12-dev, libgtk2.0-dev, x11proto-core-dev, x11proto-input-dev, libxi-dev, libgconf2-dev, libjpeg62-dev, libcanberra-dev
+Build-Depends: debhelper (>= 4.0.0), pkg-config, libx11-dev, libdbus-1-dev (>= 0.60), libosso-dev, libxsp-dev, libpng12-dev, libgtk2.0-dev, x11proto-core-dev, x11proto-input-dev, libxi-dev, libgconf2-dev, libjpeg62-dev, libcanberra-dev, upstart-dev
Standards-Version: 3.6.0
Package: osso-af-utils
Modified: projects/haf/trunk/osso-af-utils/debian/rules
===================================================================
--- projects/haf/trunk/osso-af-utils/debian/rules 2009-06-09 08:56:03 UTC (rev 18673)
+++ projects/haf/trunk/osso-af-utils/debian/rules 2009-06-09 08:58:30 UTC (rev 18674)
@@ -108,6 +108,7 @@
# dh_installcron
# dh_installinfo
dh_installman
+ dh_installxsession --init-script='tmp-reaper' -u 'post 41'
dh_link
dh_strip --dbg-package="osso-af-utils"
dh_compress
Modified: projects/haf/trunk/osso-af-utils/src/fb-progress.c
===================================================================
--- projects/haf/trunk/osso-af-utils/src/fb-progress.c 2009-06-09 08:56:03 UTC (rev 18673)
+++ projects/haf/trunk/osso-af-utils/src/fb-progress.c 2009-06-09 08:58:30 UTC (rev 18674)
@@ -754,11 +754,14 @@
buf = malloc(cinfo.output_width * cinfo.output_components * sizeof(char));
if (!buf) {
+ fclose(fp);
return NULL;
}
image.pixel_buffer = malloc(image.wd * image.ht * depth);
if (!image.pixel_buffer) {
+ fclose(fp);
+ free(buf);
return NULL;
}
tmp=image.pixel_buffer;
@@ -799,6 +802,7 @@
fread(header, 1, 8, fp);
int is_png = !png_sig_cmp(header, 0, 8);
if (!is_png) {
+ fclose(fp);
return NULL;
}
@@ -806,16 +810,19 @@
NULL, NULL, NULL);
if (!png_ptr) {
fprintf(stderr, "could not create png_ptr!\n");
+ fclose(fp);
return NULL;
}
png_infop info_ptr = png_create_info_struct(png_ptr);
if (!info_ptr) {
png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
+ fclose(fp);
return NULL;
}
png_infop end_info = png_create_info_struct(png_ptr);
if (!end_info) {
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ fclose(fp);
return NULL;
}
@@ -850,6 +857,7 @@
uint8_t * image_data = malloc(rowbytes * image.ht);
if(!image_data) {
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ fclose(fp);
return NULL;
}
@@ -857,6 +865,7 @@
if(!row_pointers) {
free(image_data);
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ fclose(fp);
return NULL;
}
@@ -872,6 +881,8 @@
fprintf(stderr, "Not enought memory\n");
free(image_data);
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ fclose(fp);
+ free(row_pointers);
return NULL;
}
@@ -901,6 +912,7 @@
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
free(row_pointers);
free(image_data);
+ fclose(fp);
ret = malloc (sizeof(image_info_t));
*ret = image;
@@ -1069,7 +1081,6 @@
if (img_progress_real_name != NULL) {
for (Nix = 0 ; Nix < N_FRAMES ; Nix++) {
snprintf(img_progress_real_name, img_progress_real_name_len, "%s%d.png", img_progress_name, Nix + 1);
- printf("Loading image %s\n", img_progress_real_name);
Options.img_progress[Nix] = decompress_png(img_progress_real_name, fb->depth);
if (!Options.img_progress[Nix]) {
/* If png fails, try jpeg */
Modified: projects/haf/trunk/osso-af-utils/src/fb-progress.sh
===================================================================
--- projects/haf/trunk/osso-af-utils/src/fb-progress.sh 2009-06-09 08:56:03 UTC (rev 18673)
+++ projects/haf/trunk/osso-af-utils/src/fb-progress.sh 2009-06-09 08:58:30 UTC (rev 18674)
@@ -24,8 +24,9 @@
chmod 777 $AF_PIDDIR
fi
PIDFILE=$AF_PIDDIR/fb-progress.pid
-IMGDIR=/usr/share/icons/hicolor/scalable/hildon
+LOGO_IMGDIR=/usr/share/icons/hicolor/scalable/hildon
LOGO=startup_nokia_logo.png
+BAR_IMGDIR=/usr/share/icons/hicolor/48x48/hildon
BAR=indicator_update_white
SECS=9
@@ -37,7 +38,7 @@
if [ "x$BOOTREASON" != "xcharger" \
-a ! -f /tmp/skip-fb-progress.tmp ]; then
echo "Starting: fb-progress"
- fb-progress -l $IMGDIR/$LOGO -g $IMGDIR/$BAR $SECS > /dev/null 2>&1 &
+ fb-progress -l $LOGO_IMGDIR/$LOGO -g $BAR_IMGDIR/$BAR $SECS > /dev/null 2>&1 &
echo "$!" > $PIDFILE
chmod 666 $PIDFILE
fi
Modified: projects/haf/trunk/osso-af-utils/src/xset770.c
===================================================================
--- projects/haf/trunk/osso-af-utils/src/xset770.c 2009-06-09 08:56:03 UTC (rev 18673)
+++ projects/haf/trunk/osso-af-utils/src/xset770.c 2009-06-09 08:58:30 UTC (rev 18674)
@@ -77,7 +77,6 @@
if (id > 0) {
device = XOpenDevice(dpy, id);
- evalues = (XKbdFeedbackControl *)calloc(sizeof(XKbdFeedbackControl), 1);
if (!device)
return;
@@ -85,6 +84,7 @@
if (feedback_id < 0)
return;
+ evalues = (XKbdFeedbackControl *)calloc(sizeof(XKbdFeedbackControl), 1);
evalues->id = feedback_id;
evalues->key = key;
evalues->auto_repeat_mode = val;
- Previous message: [maemo-commits] r18673 - projects/haf/trunk/osso-af-utils
- Next message: [maemo-commits] r18675 - projects/haf/tags/osso-af-utils
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]