diff options
Diffstat (limited to 'xlators/encryption/rot-13')
| -rw-r--r-- | xlators/encryption/rot-13/src/Makefile.am | 7 | ||||
| -rw-r--r-- | xlators/encryption/rot-13/src/rot-13.c | 43 | ||||
| -rw-r--r-- | xlators/encryption/rot-13/src/rot-13.h | 20 |
3 files changed, 25 insertions, 45 deletions
diff --git a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am index ba5e623d8..94e8d18e7 100644 --- a/xlators/encryption/rot-13/src/Makefile.am +++ b/xlators/encryption/rot-13/src/Makefile.am @@ -1,14 +1,15 @@ xlator_LTLIBRARIES = rot-13.la xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption -rot_13_la_LDFLAGS = -module -avoidversion +rot_13_la_LDFLAGS = -module -avoid-version rot_13_la_SOURCES = rot-13.c rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = rot-13.h -AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ - -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) +AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src + +AM_CFLAGS = -Wall $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/encryption/rot-13/src/rot-13.c b/xlators/encryption/rot-13/src/rot-13.c index 697465fd3..b9ac29a72 100644 --- a/xlators/encryption/rot-13/src/rot-13.c +++ b/xlators/encryption/rot-13/src/rot-13.c @@ -1,22 +1,12 @@ /* - Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com> - This file is part of GlusterFS. - - GlusterFS 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. - - GlusterFS 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/>. -*/ + Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com> + This file is part of GlusterFS. + This file is licensed to you under your choice of the GNU Lesser + General Public License, version 3 or any later version (LGPLv3 or + later), or the GNU General Public License, version 2 (GPLv2), in all + cases as published by the Free Software Foundation. +*/ #include <ctype.h> #include <sys/uio.h> @@ -32,13 +22,13 @@ #include "rot-13.h" /* - * This is a rot13 ``encryption'' xlator. It rot13's data when - * writing to disk and rot13's it back when reading it. + * This is a rot13 ``encryption'' xlator. It rot13's data when + * writing to disk and rot13's it back when reading it. * This xlator is meant as an example, NOT FOR PRODUCTION * USE ;) (hence no error-checking) */ -void +void rot13 (char *buf, int len) { int i; @@ -71,7 +61,7 @@ rot13_readv_cbk (call_frame_t *frame, struct iobref *iobref, dict_t *xdata) { rot_13_private_t *priv = (rot_13_private_t *)this->private; - + if (priv->decrypt_read) rot13_iovec (vector, count); @@ -138,7 +128,7 @@ init (xlator_t *this) rot_13_private_t *priv = NULL; if (!this->children || this->children->next) { - gf_log ("rot13", GF_LOG_ERROR, + gf_log ("rot13", GF_LOG_ERROR, "FATAL: rot13 should have exactly one child"); return -1; } @@ -196,15 +186,14 @@ struct xlator_fops fops = { .writev = rot13_writev }; -struct xlator_cbks cbks = { -}; +struct xlator_cbks cbks; struct volume_options options[] = { - { .key = {"encrypt-write"}, + { .key = {"encrypt-write"}, .type = GF_OPTION_TYPE_BOOL }, - { .key = {"decrypt-read"}, - .type = GF_OPTION_TYPE_BOOL + { .key = {"decrypt-read"}, + .type = GF_OPTION_TYPE_BOOL }, { .key = {NULL} }, }; diff --git a/xlators/encryption/rot-13/src/rot-13.h b/xlators/encryption/rot-13/src/rot-13.h index 8ef8162ae..3e9fc19c7 100644 --- a/xlators/encryption/rot-13/src/rot-13.h +++ b/xlators/encryption/rot-13/src/rot-13.h @@ -1,22 +1,12 @@ /* - Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com> + Copyright (c) 2006-2012 Red Hat, Inc. <http://www.redhat.com> This file is part of GlusterFS. - GlusterFS 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. - - GlusterFS 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/>. + This file is licensed to you under your choice of the GNU Lesser + General Public License, version 3 or any later version (LGPLv3 or + later), or the GNU General Public License, version 2 (GPLv2), in all + cases as published by the Free Software Foundation. */ - #ifndef __ROT_13_H__ #define __ROT_13_H__ |