grim/guifications3

Parents 8e6f170cb062
Children c257c44bdf6a
removed GfHash since nothing is using it right now and we can just use the hashing stuff in glib
--- a/gflib/gflib/CMakeLists.txt Mon May 16 23:28:48 2011 -0500
+++ b/gflib/gflib/CMakeLists.txt Tue May 17 20:53:47 2011 -0500
@@ -15,7 +15,6 @@
gf_feed_manager.h
gf_file_logger.h
gf_filesystem.h
- gf_hash.h
gf_image.h
gf_log.h
gf_logger.h
@@ -62,7 +61,6 @@
gf_feed_manager.c
gf_file_logger.c
gf_filesystem.c
- gf_hash.c
gf_image.c
gf_log.c
gf_logger.c
--- a/gflib/gflib/gf_hash.c Mon May 16 23:28:48 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-/*
- * Guifications - The end-all, be-all notification framework
- * Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>
- *
- * 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, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-#include <gflib/gf_hash.h>
-
-/******************************************************************************
- * GfHash API
- *****************************************************************************/
-GType
-gf_hash_get_type(void) {
- static GType type = 0;
-
- if(type == 0) {
- static const GTypeInfo info = {
- sizeof(GfHashClass),
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- sizeof(GfHash),
- 0,
- NULL,
- };
-
- type = g_type_register_static(GF_TYPE_OBJECT,
- "GfHash",
- &info, G_TYPE_FLAG_ABSTRACT);
- }
-
- return type;
-}
-
-/**
- * gf_hash_init;
- * @hash : The #GfHash instance.
- *
- * Initializes @hash.
- */
-void
-gf_hash_init(GfHash *hash) {
- GfHashClass *klass;
-
- g_return_if_fail(GF_IS_HASH(hash));
-
- klass = GF_HASH_GET_CLASS(hash);
-
- g_return_if_fail(GF_IS_HASH_CLASS(klass));
-
- if(klass->init)
- klass->init(hash);
-}
-
-/**
- * gf_hash_reset:
- * @hash : The #GfHash instance.
- *
- * Resets @hash.
- */
-void
-gf_hash_reset(GfHash *hash) {
- GfHashClass *klass;
-
- g_return_if_fail(GF_IS_HASH(hash));
-
- klass = GF_HASH_GET_CLASS(hash);
-
- g_return_if_fail(GF_IS_HASH_CLASS(klass));
-
- if(klass->reset)
- klass->reset(hash);
-}
-
-/**
- * gf_hash_uninit:
- * @hash : The #GfHash instance.
- *
- * Uninitializes @hash.
- */
-void
-gf_hash_uninit(GfHash *hash) {
- GfHashClass *klass;
-
- g_return_if_fail(GF_IS_HASH(hash));
-
- klass = GF_HASH_GET_CLASS(hash);
-
- g_return_if_fail(GF_IS_HASH_CLASS(klass));
-
- if(klass->uninit)
- klass->uninit(hash);
-}
-
-/**
- * gf_hash_append:
- * @hash : The #GfHash instance.
- * @data : The data to append.
- * @data_sz : The size of @data.
- *
- * Appends @data to @hash.
- */
-void
-gf_hash_append(GfHash *hash, const guint8 *data, gsize data_sz) {
- GfHashClass *klass;
-
- g_return_if_fail(GF_IS_HASH(hash));
-
- klass = GF_HASH_GET_CLASS(hash);
-
- g_return_if_fail(GF_IS_HASH_CLASS(klass));
-
- if(klass->append)
- klass->append(hash, data, data_sz);
-}
-
-/**
- * gf_hash_digest:
- * @hash : The #GfHash instance.
- * @in_sz : The size of @digest.
- * @digest : The output buffer.
- * @out_sz : The size written to @digest.
- *
- * Digests @hash.
- *
- * Return Value: TRUE on success.
- */
-gboolean
-gf_hash_digest(GfHash *hash, gsize in_sz, guint8 *digest, gsize *out_sz) {
- GfHashClass *klass;
-
- g_return_val_if_fail(GF_IS_HASH(hash), FALSE);
- g_return_val_if_fail(digest, FALSE);
-
- klass = GF_HASH_GET_CLASS(hash);
-
- g_return_val_if_fail(GF_IS_HASH_CLASS(klass), FALSE);
-
- if(klass->digest)
- return klass->digest(hash, in_sz, digest, out_sz);
-
- return FALSE;
-}
--- a/gflib/gflib/gf_hash.h Mon May 16 23:28:48 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
- * Guifications - The end-all, be-all notification framework
- * Copyright (C) 2003-2009 Gary Kramlich <grim@reaperworld.com>
- *
- * 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, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-#ifndef GF_HASH_H
-#define GF_HASH_H
-
-#include <gflib/gf_object.h>
-
-#define GF_TYPE_HASH (gf_hash_get_type())
-#define GF_HASH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GF_TYPE_HASH, GfHash))
-#define GF_HASH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GF_TYPE_HASH, GfHashClass))
-#define GF_IS_HASH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GF_TYPE_HASH))
-#define GF_IS_HASH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GF_TYPE_HASH))
-#define GF_HASH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GF_TYPE_HASH, GfHashClass))
-
-typedef struct _GfHash GfHash;
-typedef struct _GfHashClass GfHashClass;
-
-/**
- * GfHash:
- *
- * A base class for all hashing implementations.
- */
-struct _GfHash {
- /*< private >*/
- GfObject gparent;
-};
-
-struct _GfHashClass {
- GfObjectClass gparent;
-
- void (*init)(GfHash *hash);
- void (*reset)(GfHash *hash);
- void (*uninit)(GfHash *hash);
-
- void (*append)(GfHash *hash, const guint8 *data, gsize data_sz);
- gboolean (*digest)(GfHash *hash, gsize in_sz, guint8 *digest, gsize *out_sz);
-
- void (*_gf_reserved1)(void);
- void (*_gf_reserved2)(void);
- void (*_gf_reserved3)(void);
- void (*_gf_reserved4)(void);
-};
-
-G_BEGIN_DECLS
-
-GType gf_hash_get_type(void);
-void gf_hash_init(GfHash *hash);
-void gf_hash_reset(GfHash *hash);
-void gf_hash_uninit(GfHash *hash);
-
-void gf_hash_append(GfHash *hash, const guint8 *data, gsize data_sz);
-gboolean gf_hash_digest(GfHash *hash, gsize in_sz, guint8 *digest, gsize *out_sz);
-
-G_END_DECLS
-
-#endif /* GF_HASH_H */