Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/ephoto
Dir : e17/apps/ephoto/src/bin
Modified Files:
Makefile.am ephoto.c ephoto_database.c ephoto_exif.c
ephoto_list_view.c ephoto_main.c ephoto_utils.c
Log Message:
More cleanups, ephoto now compiles with -Wall and -Werror.
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 15 Feb 2007 10:20:21 -0000 1.1
+++ Makefile.am 24 Feb 2007 23:30:49 -0000 1.2
@@ -15,7 +15,7 @@
ephoto_normal_view.c \
ephoto_utils.c
-ephoto_CFLAGS = @ewl_cflags@
+ephoto_CFLAGS = @ewl_cflags@ -Wall -Werror
ephoto_LDADD = @ewl_libs@ -lsqlite3 -lexif
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto.c 15 Feb 2007 10:20:21 -0000 1.1
+++ ephoto.c 24 Feb 2007 23:30:49 -0000 1.2
@@ -2,7 +2,7 @@
int main(int argc, char **argv)
{
- char *album, *name, *description, *path, input[2];
+ char *album, *name, *description, *path, input;
int i;
Ecore_List *albums, *images;
sqlite3 *db;
@@ -72,7 +72,7 @@
"the name %s and the description %s? ",
name, description);
scanf("%c", &input);
- if(!strncasecmp(input, "y", 1))
+ if(input == 'y' || input == 'Y')
{
db = ephoto_db_init();
ephoto_db_add_album(db, name, description);
@@ -113,7 +113,7 @@
"to album %s with a name %s and path %s? ",
album, name, path);
scanf("%c", &input);
- if(!strncasecmp(input, "y", 1))
+ if(input == 'y' || input == 'Y')
{
db = ephoto_db_init();
ephoto_db_add_image(db, album, name, path);
@@ -146,7 +146,7 @@
"from the directory %s to the album %s? ",
path, album);
scanf("%c", &input);
- if(!strncasecmp(input, "y", 1))
+ if(input == 'y' || input == 'Y')
{
db = ephoto_db_init();
images = ecore_list_new();
@@ -212,7 +212,7 @@
printf("Are you sure you want to remove the album %s?
",
name);
scanf("%c", &input);
- if(!strncasecmp(input, "y", 1))
+ if(input == 'y' || input == 'Y')
{
db = ephoto_db_init();
ephoto_db_delete_album(db, name);
@@ -246,7 +246,7 @@
"from the album %s? ",
path, album);
scanf("%c", &input);
- if(!strncasecmp(input, "y", 1))
+ if(input == 'y' || input == 'Y')
{
db = ephoto_db_init();
ephoto_db_delete_image(db, album, path);
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_database.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ephoto_database.c 24 Feb 2007 22:57:09 -0000 1.4
+++ ephoto_database.c 24 Feb 2007 23:30:49 -0000 1.5
@@ -97,7 +97,7 @@
sqlite3_exec(db, command, 0, 0, 0);
snprintf(command, PATH_MAX, "SELECT id FROM albums WHERE name = '%s';",
name);
sqlite3_exec(db, command, get_album_id, 0, 0);
- snprintf(command, PATH_MAX, "DELETE FROM album_images WHERE album_id =
'%s';", album_id);
+ snprintf(command, PATH_MAX, "DELETE FROM album_images WHERE album_id =
'%d';", album_id);
sqlite3_exec(db, command, 0, 0, 0);
return;
@@ -190,7 +190,6 @@
/*Populate a list of the id's of images belonging to a certain album*/
static int list_image_ids(void *notused, int argc, char **argv, char **col)
{
- char command[PATH_MAX];
int i;
notused = 0;
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_exif.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ephoto_exif.c 24 Feb 2007 22:57:09 -0000 1.7
+++ ephoto_exif.c 24 Feb 2007 23:30:49 -0000 1.8
@@ -136,7 +136,6 @@
void display_exif_dialog(Ewl_Widget *w, void *event, void *data)
{
const char *img;
- Ecore_Hash *exif_info;
Ewl_Widget *win, *vbox, *image, *sp, *list, *label;
Ewl_Model *model;
Ewl_View *view;
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_list_view.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ephoto_list_view.c 24 Feb 2007 22:57:09 -0000 1.7
+++ ephoto_list_view.c 24 Feb 2007 23:30:49 -0000 1.8
@@ -141,7 +141,7 @@
image = ecore_list_goto_index(em->images, row);
if (image)
{
- val = image;
+ val = (void *)image;
}
return val;
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ephoto_main.c 24 Feb 2007 22:57:09 -0000 1.7
+++ ephoto_main.c 24 Feb 2007 23:30:49 -0000 1.8
@@ -55,8 +55,8 @@
/*Create the Main Ephoto Window*/
void create_main_gui(void)
{
- Ewl_Widget *vbox, *spacer, *text, *entry, *hbox;
- Ewl_Widget *rvbox, *sp, *hsep, *vsep, *image;
+ Ewl_Widget *vbox, *spacer, *entry, *hbox;
+ Ewl_Widget *rvbox, *hsep, *vsep, *image;
em = NULL;
em = calloc(1, sizeof(Ephoto_Main));
@@ -209,7 +209,7 @@
{
const char *album;
char *imagef;
- Ewl_Widget *shadow, *thumb;
+ Ewl_Widget *thumb;
if (w)
{
@@ -421,7 +421,7 @@
album = ecore_list_goto_index(em->albums, row);
if (album)
{
- val = album;
+ val = (void *)album;
}
return val;
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_utils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ephoto_utils.c 22 Feb 2007 04:06:31 -0000 1.2
+++ ephoto_utils.c 24 Feb 2007 23:30:49 -0000 1.3
@@ -45,7 +45,6 @@
/*Get the pixels and return them in integers*/
void image_pixels_int_get(const char *file, int *width, int *height)
{
- char pixels[PATH_MAX];
int w, h;
Evas_Imaging_Image *image;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
