Update of /cvsroot/libexif/libmnote/libmnote/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv24005/libmnote/olympus
Modified Files:
mnote-olympus-data.c mnote-olympus-entry.c
Log Message:
Drop EOL blanks and // comments
Index: mnote-olympus-data.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-data.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mnote-olympus-data.c 25 Aug 2003 21:00:24 -0000 1.5
+++ mnote-olympus-data.c 17 Sep 2003 11:25:59 -0000 1.6
@@ -7,10 +7,10 @@
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
@@ -79,18 +79,18 @@
}
#ifdef DEBUG
-// Look at memory around p
+/* Look at memory around p */
static void dump_memory_around(const unsigned char *p)
{
static char *format = "%xl %xl %xl %xl\n";
static unsigned buf[4];
unsigned int i;
-
+
for (i = 0; i < 5; i++) {
memcpy(buf, p - 32 + (16 * i), sizeof(buf));
printf(format, buf[0], buf[1], buf[2], buf[3]);
}
-
+
}
#endif
@@ -123,8 +123,8 @@
if (!s)
return;
if (s > 4) {
-
- /*
+
+ /*
THIS DOES NOT WORK!
The problem is that d points to the first MakerNote Tag.
According to the EXIF 2.1 spec, it should point to the
@@ -147,11 +147,11 @@
doff = offset + 8;
d_orig = d + doff;
}
-
+
/* Sanity check */
/* This doesn't work if the data is outside the tag!! */
- if ((s <= 4) && (size < doff + s))
+ if ((s <= 4) && (size < doff + s))
return;
entry->data = malloc (sizeof (char) * s);
@@ -192,7 +192,7 @@
if ((size < 22) || memcmp (p, "OLYMP", 5)) {
exif_data_unref (ed);
return;
- }
+ }
nEntries = exif_get_short (p + 8, o);
tagEntries = p + 10;
Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/olympus/mnote-olympus-entry.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mnote-olympus-entry.c 29 Aug 2003 09:36:19 -0000 1.6
+++ mnote-olympus-entry.c 17 Sep 2003 11:25:59 -0000 1.7
@@ -7,10 +7,10 @@
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
@@ -101,7 +101,7 @@
char buf[1024];
unsigned int i;
-
+
for (i = 0; i < 2 * indent; i++)
buf[i] = ' ';
buf[i] = '\0';
@@ -192,11 +192,11 @@
vl = exif_get_long (entry->data + 4, order);
switch (vl) {
case 1:
- strncat (v, _("left to right"),
+ strncat (v, _("left to right"),
sizeof (v) - 1 - strlen(v));
break;
case 2:
- strncat (v, _("right to left"),
+ strncat (v, _("right to left"),
sizeof (v) - 1 - strlen(v));
break;
case 3:
@@ -323,7 +323,7 @@
}
else {
unsigned long tmp = vr.numerator / vr.denominator;
-// printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator);
+ /* printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator); */
snprintf (v, sizeof (v), "%li mm", tmp);
}
break;
@@ -387,10 +387,10 @@
else {
strncpy (v, _("Manual: Unknown"), sizeof (v));
}
-
+
}
break;
- case 3:
+ case 3:
strncpy (v, _("One-touch"), sizeof (v));
break;
default:
|
