Menu
▾
▴
[libexif-cvs] libmnote/libmnote mnote-data.c,1.3,1.4
|
From: Lutz M?l. <lu...@us...> - 2003-07-24 20:18:15
|
Update of /cvsroot/libexif/libmnote/libmnote
In directory sc8-pr-cvs1:/tmp/cvs-serv21220/libmnote
Modified Files:
mnote-data.c
Log Message:
2003-07-24 Lutz Mueller <lu...@us...>
* libmnote: Lots of improvements from Al Evans <al...@tb...>.
Index: mnote-data.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/mnote-data.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mnote-data.c 15 Dec 2002 11:44:18 -0000 1.3
+++ mnote-data.c 24 Jul 2003 20:18:10 -0000 1.4
@@ -39,12 +39,10 @@
void
mnote_data_construct (MNoteData *note)
{
- if (!note)
- return;
+ if (!note) return;
note->priv = malloc (sizeof (MNoteDataPrivate));
- if (!note->priv)
- return;
+ if (!note->priv) return;
memset (note->priv, 0, sizeof (MNoteDataPrivate));
note->priv->ref_count = 1;
@@ -53,8 +51,7 @@
void
mnote_data_ref (MNoteData *note)
{
- if (!note || !note->priv)
- return;
+ if (!note || !note->priv) return;
note->priv->ref_count++;
}
@@ -62,19 +59,16 @@
void
mnote_data_unref (MNoteData *note)
{
- if (!note || !note->priv)
- return;
+ if (!note || !note->priv) return;
note->priv->ref_count--;
- if (!note->priv->ref_count)
- mnote_data_free (note);
+ if (!note->priv->ref_count) mnote_data_free (note);
}
void
mnote_data_free (MNoteData *note)
{
- if (!note)
- return;
+ if (!note) return;
if (note->priv) {
free (note->priv);
@@ -88,8 +82,7 @@
mnote_data_save_data (MNoteData *note,
unsigned char **data, unsigned int *size)
{
- if (!note)
- return;
+ if (!note) return;
if (note->methods.save_data)
note->methods.save_data (note, data, size);
@@ -99,8 +92,7 @@
mnote_data_load_data (MNoteData *note,
const unsigned char *data, unsigned int size)
{
- if (!note)
- return;
+ if (!note) return;
if (note->methods.load_data)
note->methods.load_data (note, data, size);
@@ -111,8 +103,7 @@
{
MNoteData *note = NULL;
- if (!size || !data)
- return (NULL);
+ if (!size || !data) return NULL;
/* Canon notes begin with 0x0000 */
if ((size > 1) && (data[0] == 0x00) && (data[1] == 0x00))
@@ -126,12 +117,9 @@
} else if (size >= 2 && (data[0] == 0x00) && (data[1] == 0x1b)) {
note = mnote_pentax_data_new ();
- } else {
- note = NULL;
- }
+ } else note = NULL;
- if (note)
- mnote_data_load_data (note, data, size);
+ if (note) mnote_data_load_data (note, data, size);
return (note);
}
@@ -140,44 +128,39 @@
mnote_data_save_to_data (MNoteData *note,
unsigned char **data, unsigned int *size)
{
- if (!note || !size || !data)
- return;
+ if (!note || !size || !data) return;
- mnote_data_save_data(note, data, size);
+ mnote_data_save_data (note, data, size);
}
const char *
mnote_tag_get_name (MNoteData *note, MNoteTag tag)
{
- if (!note || !note->methods.get_tag_name)
- return (NULL);
+ if (!note || !note->methods.get_tag_name) return NULL;
- return (note->methods.get_tag_name (tag));
+ return note->methods.get_tag_name (tag);
}
const char *
mnote_tag_get_title (MNoteData *note, MNoteTag tag)
{
- if (!note || !note->methods.get_tag_title)
- return (NULL);
+ if (!note || !note->methods.get_tag_title) return NULL;
- return (note->methods.get_tag_title (tag));
+ return note->methods.get_tag_title (tag);
}
const char *
mnote_tag_get_description (MNoteData *note, MNoteTag tag)
{
- if (!note || !note->methods.get_tag_description)
- return (NULL);
+ if (!note || !note->methods.get_tag_description) return NULL;
- return (note->methods.get_tag_description (tag));
+ return note->methods.get_tag_description (tag);
}
char *
mnote_data_get_value (MNoteData *note, MNoteTag tag)
{
- if (!note || !note->methods.get_value)
- return (NULL);
+ if (!note || !note->methods.get_value) return (NULL);
return (note->methods.get_value (note, tag));
}
@@ -190,8 +173,7 @@
note->priv->order = order;
- if (!note->methods.set_order)
- return;
+ if (!note->methods.set_order) return;
note->methods.set_order (note, order);
}
@@ -199,17 +181,15 @@
ExifByteOrder
mnote_data_get_byte_order (MNoteData *note)
{
- if (!note || !note->priv)
- return (0);
+ if (!note || !note->priv) return 0;
- return (note->priv->order);
+ return note->priv->order;
}
void
mnote_data_foreach_entry (MNoteData *note, MNoteDataForeachEntryFunc func, void *user_data)
{
- if (!note || !note->methods.foreach_entry)
- return;
+ if (!note || !note->methods.foreach_entry) return;
note->methods.foreach_entry (note, func, user_data);
}
@@ -222,29 +202,28 @@
if (!note || !note->methods.get_entry || !note->methods.dump_entry)
return;
- entry = note->methods.get_entry(note, tag);
+ entry = note->methods.get_entry (note, tag);
- if (!entry)
- return;
+ if (!entry) return;
- note->methods.dump_entry(entry, indent);
+ note->methods.dump_entry (entry, indent);
}
void
mnote_data_dump (MNoteData *note, unsigned int indent)
{
char buf[1024];
- unsigned int i;
- if (!note || !note->methods.get_count || !note->methods.dump_entry)
- return;
+ if (!note || !note->methods.dump_entry) return;
- for (i = 0; i < 2 * indent; i++)
- buf[i] = ' ';
- buf[i] = '\0';
+ memset (buf, ' ', 2 * indent);
+ buf[2 * indent] = '\0';
- printf ("%sDumping MakerNote content (%i entries)...\n", buf,
- note->methods.get_count(note));
+ if (note->methods.get_count)
+ printf ("%sDumping MakerNote content (%i entries)...\n", buf,
+ note->methods.get_count (note));
- mnote_data_foreach_entry (note, (MNoteDataForeachEntryFunc)mnote_data_dump_entry, (void *)indent);
+ mnote_data_foreach_entry (note,
+ (MNoteDataForeachEntryFunc) mnote_data_dump_entry,
+ (void *) indent);
}
|
