Changeset 135

Timestamp:

02/15/06 20:15:38 (3 years ago)

Author:

conrad

Message:

move photo_put() into photo.c, move send() into cgi.c as cgi_send()

Files:

• fastphoto/trunk/src/Makefile.am (modified) (1 diff)
• fastphoto/trunk/src/cache.c (modified) (3 diffs)
• fastphoto/trunk/src/cache.h (modified) (1 diff)
• fastphoto/trunk/src/cgi.c (modified) (2 diffs)
• fastphoto/trunk/src/cgi.h (modified) (1 diff)
• fastphoto/trunk/src/main.c (modified) (2 diffs)
• fastphoto/trunk/src/resize.c (modified) (2 diffs)
• fastphoto/trunk/src/send.c (deleted)
• fastphoto/trunk/src/send.h (deleted)

fastphoto/trunk/src/Makefile.am

@@ -5 +5 @@
-bin_PROGRAMS = fastphoto
-
-resize.h send
+photo.h resize
-
-resize.c send
+photo.c resize
-fastphoto_LDADD = $(EPEG_LIBS)

fastphoto/trunk/src/cache.c

@@ -8 +8 @@
-
-#include "fastphoto.h"
+#include "photo.h"
-#include "alloc_snprintf.h"
-
@@ -44 +45 @@
-}
-
-int
-file_check (photo_t * photo)
-{
-    struct stat statbuf;
-
-    if (stat (photo->name, &statbuf) == -1) {
-        switch (errno) {
-            case ENOENT:
-                return 0;
-            default:
-                fprintf (stderr, "fastphoto: Error checking %s: %s\n", photo->name, strerror (errno));
-                return -1;
-        }
-    }
-
-    photo->mtime = statbuf.st_mtime;
-    photo->size = statbuf.st_size;
-
-    return 1;
-}
-
-static int
-cache_check (fastphoto_t * params)
@@ -70 +50 @@
-    int ret;
-
-file_check
+photo_stat
-        return ret;
-    }
-
-file_check
+photo_stat
-        return ret;
-    }

fastphoto/trunk/src/cache.h

@@ -7 +7 @@
-int memory_send (fastphoto_t * params);
-
-int file_check (photo_t * photo);
-
-
-#endif /* __CACHE_H__ */

fastphoto/trunk/src/cgi.c

@@ -7 +7 @@
-#include "fastphoto.h"
-#include "cache.h"
-
-
-
-
+
+
-
-static void
@@ -106 +104 @@
-  return 1;
-}
+
+size_t
+send_memory (fastphoto_t * params)
+{
+    size_t n = fwrite (params->data, 1, params->data_size, stdout);
+    fflush (stdout);
+    return n;
+}
+
+int
+cgi_send (fastphoto_t * params)
+{
+  header_content_length (params->out.size);
+  header_end();
+
+  if (params->out.name) {
+    photo_put (&params->out);
+  } else {
+    fprintf (stderr, "fastphoto: Sending from memory ...\n");
+    send_memory (params);
+  }
+
+  return 1;
+}

fastphoto/trunk/src/cgi.h

@@ -7 +7 @@
-int cgi_send (fastphoto_t * params);
-
+size_t send_memory (fastphoto_t * params);
+
-#endif /* __CGI_H__ */

fastphoto/trunk/src/main.c

@@ -12 +12 @@
-#include "header.h"
-#include "resize.h"
-#include "send.h"
-
-static void
@@ -173 +172 @@
-    if (!err) {
-      if (cgi) {
-
+cgi_
-      } else if (!params.out.name) {
-        send_memory (&params);

fastphoto/trunk/src/resize.c

@@ -3 +3 @@
-
-#include "fastphoto.h"
-cache.h" /* file_check() */
+photo.h"
-
-int
@@ -59 +59 @@
-
-  if (params->out.name)
-file_check
+photo_stat
-  else
-    params->out.size = (off_t)params->data_size;