Skip to content

Commit

Permalink
Removed whitespaces so that we don't polute future commits
Browse files Browse the repository at this point in the history
  • Loading branch information
mrsimo committed Mar 7, 2011
1 parent f3f6390 commit 17fba43
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 39 deletions.
34 changes: 17 additions & 17 deletions Makefile
Expand Up @@ -43,19 +43,19 @@ LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static

RUBY_EXTCONF_H =
CFLAGS = -fPIC -fno-strict-aliasing -g -g -O2 -fPIC $(cflags)
RUBY_EXTCONF_H =
CFLAGS = -fPIC -fno-strict-aliasing -g -g -O2 -fPIC $(cflags)
INCFLAGS = -I. -I. -I/usr/lib/ruby/1.8/x86_64-linux -I.
DEFS =
CPPFLAGS = -DHAVE_GPGME_OP_EXPORT_KEYS
CXXFLAGS = $(CFLAGS)
DEFS =
CPPFLAGS = -DHAVE_GPGME_OP_EXPORT_KEYS
CXXFLAGS = $(CFLAGS)
ldflags = -L. -rdynamic -Wl,-export-dynamic
dldflags =
archflag =
dldflags =
archflag =
DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
LDSHARED = $(CC) -shared
AR = ar
EXEEXT =
EXEEXT =

RUBY_INSTALL_NAME = ruby1.8
RUBY_SO_NAME = ruby1.8
Expand All @@ -73,26 +73,26 @@ COPY = cp

#### End of system configuration section. ####

preload =
preload =

libpath = . $(libdir)
LIBPATH = -L. -L$(libdir)
DEFFILE =
DEFFILE =

CLEANFILES = mkmf.log
DISTCLEANFILES =
DISTCLEANFILES =

extout =
extout_prefix =
target_prefix =
LOCAL_LIBS =
extout =
extout_prefix =
target_prefix =
LOCAL_LIBS =
LIBS = $(LIBRUBYARG_SHARED) -lgpgme -lgpg-error -lpthread -lrt -ldl -lcrypt -lm -lc
SRCS = gpgme_n.c
OBJS = gpgme_n.o
TARGET = gpgme_n
DLLIB = $(TARGET).so
EXTSTATIC =
STATIC_LIB =
EXTSTATIC =
STATIC_LIB =

BINDIR = $(bindir)
RUBYCOMMONDIR = $(sitedir)$(target_prefix)
Expand Down
2 changes: 1 addition & 1 deletion examples/genkey.rb
Expand Up @@ -29,7 +29,7 @@
$stderr.flush
exit(1) unless gets.chomp == 'y'
end

def progfunc(hook, what, type, current, total)
$stderr.write("#{what}: #{current}/#{total}\r")
$stderr.flush
Expand Down
16 changes: 8 additions & 8 deletions gpgme_n.c
Expand Up @@ -228,7 +228,7 @@ rb_s_gpgme_data_new (VALUE dummy, VALUE rdh)
if (gpgme_err_code(err) == GPG_ERR_NO_ERROR)
rb_ary_store (rdh, 0, WRAP_GPGME_DATA(dh));
return LONG2NUM(err);
}
}

static VALUE
rb_s_gpgme_data_new_from_mem (VALUE dummy, VALUE rdh, VALUE vbuffer,
Expand All @@ -249,7 +249,7 @@ rb_s_gpgme_data_new_from_mem (VALUE dummy, VALUE rdh, VALUE vbuffer,
rb_ary_store (rdh, 0, vdh);
}
return LONG2NUM(err);
}
}

static VALUE
rb_s_gpgme_data_new_from_fd (VALUE dummy, VALUE rdh, VALUE vfd)
Expand Down Expand Up @@ -494,7 +494,7 @@ rb_s_gpgme_set_textmode (VALUE dummy, VALUE vctx, VALUE vyes)
rb_raise (rb_eArgError, "released ctx");
gpgme_set_textmode (ctx, NUM2INT(vyes));
return Qnil;
}
}

static VALUE
rb_s_gpgme_get_textmode (VALUE dummy, VALUE vctx)
Expand All @@ -507,7 +507,7 @@ rb_s_gpgme_get_textmode (VALUE dummy, VALUE vctx)
rb_raise (rb_eArgError, "released ctx");
yes = gpgme_get_textmode (ctx);
return INT2FIX(yes);
}
}

static VALUE
rb_s_gpgme_set_include_certs (VALUE dummy, VALUE vctx, VALUE vnr_of_certs)
Expand Down Expand Up @@ -609,7 +609,7 @@ rb_s_gpgme_get_passphrase_cb (VALUE dummy, VALUE vctx, VALUE rpassfunc,
return Qnil;
}

static void
static void
progress_cb (void *hook, const char *what, int type, int current, int total)
{
VALUE vcb = (VALUE)hook, vprogfunc, vhook_value;
Expand Down Expand Up @@ -657,7 +657,7 @@ rb_s_gpgme_set_locale (VALUE dummy, VALUE vctx, VALUE vcategory, VALUE vvalue)
{
gpgme_ctx_t ctx;
gpgme_error_t err;

UNWRAP_GPGME_CTX(vctx, ctx);
if (!ctx)
rb_raise (rb_eArgError, "released ctx");
Expand Down Expand Up @@ -1518,7 +1518,7 @@ rb_s_gpgme_op_verify_result (VALUE dummy, VALUE vctx)
gpgme_verify_result_t verify_result;
gpgme_signature_t signature;
VALUE vverify_result, vsignatures = rb_ary_new ();

UNWRAP_GPGME_CTX(vctx, ctx);
if (!ctx)
rb_raise (rb_eArgError, "released ctx");
Expand Down Expand Up @@ -1924,7 +1924,7 @@ rb_s_gpgme_wait (VALUE dummy, VALUE vctx, VALUE rstatus, VALUE vhang)
return Qnil;
}

void
void
Init_gpgme_n (void)
{
VALUE mGPGME;
Expand Down
26 changes: 13 additions & 13 deletions lib/gpgme.rb
Expand Up @@ -45,7 +45,7 @@
The same example can be rewritten in the mid level API as follows.
$ ruby -rgpgme -e <<End
$ ruby -rgpgme -e <<End
ctx = GPGME::Ctx.new
plain = GPGME::Data.from_io($stdin)
sig = GPGME::Data.from_io($stdout)
Expand All @@ -56,7 +56,7 @@
The same example can be rewritten in the lowest level API as follows.
$ ruby -rgpgme -e <<End
$ ruby -rgpgme -e <<End
ret = Array.new
GPGME::gpgme_new(ret)
ctx = ret.shift
Expand Down Expand Up @@ -102,7 +102,7 @@
# <code>GPGME.decrypt</code> performs decryption.
#
# The arguments should be specified as follows.
#
#
# - GPGME.decrypt(<i>cipher</i>, <i>plain</i>, <i>options</i>)
# - GPGME.decrypt(<i>cipher</i>, <i>options</i>) -> <i>plain</i>
#
Expand Down Expand Up @@ -157,7 +157,7 @@ def GPGME.decrypt(cipher, *args_options)
# <code>GPGME.verify</code> verifies a signature.
#
# The arguments should be specified as follows.
#
#
# - GPGME.verify(<i>sig</i>, <i>signed_text</i>, <i>plain</i>, <i>options</i>)
# - GPGME.verify(<i>sig</i>, <i>signed_text</i>, <i>options</i>) -> <i>plain</i>
#
Expand Down Expand Up @@ -210,7 +210,7 @@ def GPGME.verify(sig, *args_options) # :yields: signature
# <code>GPGME.sign</code> creates a signature of the plaintext.
#
# The arguments should be specified as follows.
#
#
# - GPGME.sign(<i>plain</i>, <i>sig</i>, <i>options</i>)
# - GPGME.sign(<i>plain</i>, <i>options</i>) -> <i>sig</i>
#
Expand Down Expand Up @@ -264,7 +264,7 @@ def GPGME.sign(plain, *args_options)
# <code>GPGME.clearsign</code> creates a cleartext signature of the plaintext.
#
# The arguments should be specified as follows.
#
#
# - GPGME.clearsign(<i>plain</i>, <i>sig</i>, <i>options</i>)
# - GPGME.clearsign(<i>plain</i>, <i>options</i>) -> <i>sig</i>
#
Expand Down Expand Up @@ -296,7 +296,7 @@ def GPGME.clearsign(plain, *args_options)
# <code>GPGME.detach_sign</code> creates a detached signature of the plaintext.
#
# The arguments should be specified as follows.
#
#
# - GPGME.detach_sign(<i>plain</i>, <i>sig</i>, <i>options</i>)
# - GPGME.detach_sign(<i>plain</i>, <i>options</i>) -> <i>sig</i>
#
Expand Down Expand Up @@ -328,7 +328,7 @@ def GPGME.detach_sign(plain, *args_options)
# <code>GPGME.encrypt</code> performs encryption.
#
# The arguments should be specified as follows.
#
#
# - GPGME.encrypt(<i>recipients</i>, <i>plain</i>, <i>cipher</i>, <i>options</i>)
# - GPGME.encrypt(<i>recipients</i>, <i>plain</i>, <i>options</i>) -> <i>cipher</i>
#
Expand Down Expand Up @@ -399,7 +399,7 @@ def GPGME.encrypt(recipients, plain, *args_options)
# <code>GPGME.list_keys</code> iterates over the key ring.
#
# The arguments should be specified as follows.
#
#
# - GPGME.list_keys(<i>pattern</i>, <i>secret_only</i>, <i>options</i>)
#
# All arguments are optional. If the last argument is a Hash, options
Expand All @@ -418,7 +418,7 @@ def GPGME.list_keys(*args_options) # :yields: key
pattern, secret_only = args
check_version(options)
GPGME::Ctx.new do |ctx|
if block_given?
if block_given?
ctx.each_key(pattern, secret_only || false) do |key|
yield key
end
Expand All @@ -434,7 +434,7 @@ def GPGME.list_keys(*args_options) # :yields: key
# <code>GPGME.export</code> extracts public keys from the key ring.
#
# The arguments should be specified as follows.
#
#
# - GPGME.export(<i>pattern</i>, <i>options</i>) -> <i>keydata</i>
# - GPGME.export(<i>pattern</i>, <i>keydata</i>, <i>options</i>)
#
Expand Down Expand Up @@ -472,7 +472,7 @@ def GPGME.export(*args_options)
# <code>GPGME.import</code> adds the keys to the key ring.
#
# The arguments should be specified as follows.
#
#
# - GPGME.import(<i>keydata</i>, <i>options</i>)
#
# All arguments are optional. If the last argument is a Hash, options
Expand Down Expand Up @@ -881,7 +881,7 @@ def encoding=(encoding)

class EngineInfo
private_class_method :new

attr_reader :protocol, :file_name, :version, :req_version, :home_dir
alias required_version req_version
end
Expand Down

0 comments on commit 17fba43

Please sign in to comment.