Clean up file header copyrights

[onak.git] / photoid.c

diff --git a/photoid.c b/photoid.c
index 8da62cee2ff723fcb0d500446828d4b48d566b03..febc3f5441847be211fb02e40c405201c8789447 100644 (file)
--- a/photoid.c
+++ b/photoid.c
@@ -1,14 +1,22 @@
 /*
  * photoid.c - Routines for OpenPGP id photos.
  *
 /*
  * photoid.c - Routines for OpenPGP id photos.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.

  *
  *

- * $Id: photoid.c,v 1.2 2004/05/27 21:58:18 noodles Exp $
+ * This program 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 General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
  */
 

-#include <assert.h>

 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>


@@ -39,9 +47,9 @@ int getphoto(struct openpgp_publickey *key, int index, unsigned char **photo,
        int                               i = 0;
        int                               j = 0;
 
        int                               i = 0;
        int                               j = 0;
 

-       assert(key != NULL);
-       assert(photo != NULL);
-       assert(length != NULL);
+       log_assert(key != NULL);
+       log_assert(photo != NULL);
+       log_assert(length != NULL);

 
        *photo = NULL;
        
 
        *photo = NULL;