Browse Source

Merge pull request #17 from cystbear/fixed-compile-warnings

Fixed compile warnings
Namdak Tonpa 10 years ago
parent
commit
dc53e8d096
8 changed files with 17 additions and 17 deletions
  1. 6 6
      src/kvs.erl
  2. 2 2
      src/kvs_acl.erl
  3. 1 1
      src/kvs_feed.erl
  4. 2 2
      src/kvs_user.erl
  5. 3 3
      src/store_kai.erl
  6. 1 1
      src/store_mnesia.erl
  7. 1 1
      src/store_redis.erl
  8. 1 1
      src/store_riak.erl

+ 6 - 6
src/kvs.erl

@@ -59,7 +59,7 @@ add(Record) when is_tuple(Record) ->
 
 
     Id = element(#iterator.id, Record),
     Id = element(#iterator.id, Record),
 
 
-    Res = kvs:get(element(1,Record), Id),
+    kvs:get(element(1,Record), Id),
 
 
     case kvs:get(element(1,Record), Id) of
     case kvs:get(element(1,Record), Id) of
         {error, not_found} ->
         {error, not_found} ->
@@ -89,7 +89,7 @@ add(Record) when is_tuple(Record) ->
                     Next = undefined,
                     Next = undefined,
                     Prev = case element(#container.top, Container) of
                     Prev = case element(#container.top, Container) of
                         undefined -> undefined;
                         undefined -> undefined;
-                        Tid -> 
+                        Tid ->
                             case kvs:get(Type, Tid) of
                             case kvs:get(Type, Tid) of
                             {error, not_found} -> undefined;
                             {error, not_found} -> undefined;
                             {ok, Top} ->
                             {ok, Top} ->
@@ -199,7 +199,7 @@ traversal(RecordType2, Start, Count, Direction)->
     {ok, R} ->  Prev = element(Direction, R),
     {ok, R} ->  Prev = element(Direction, R),
                 Count1 = case Count of C when is_integer(C) -> C - 1; _-> Count end,
                 Count1 = case Count of C when is_integer(C) -> C - 1; _-> Count end,
                 [R | traversal(RecordType2, Prev, Count1, Direction)];
                 [R | traversal(RecordType2, Prev, Count1, Direction)];
-    Error -> 
+    Error ->
      io:format("Error: ~p~n",[Error]),
      io:format("Error: ~p~n",[Error]),
       [] end.
       [] end.
 
 
@@ -230,14 +230,14 @@ table_type(A) -> A.
 
 
 range(RecordName,Id) -> Ranges = kvs:config(RecordName), find(Ranges,RecordName,Id).
 range(RecordName,Id) -> Ranges = kvs:config(RecordName), find(Ranges,RecordName,Id).
 
 
-find([],_,Id) -> [];
-find([Range|T],RecordName,Id) -> 
+find([],_,_Id) -> [];
+find([Range|T],RecordName,Id) ->
      case lookup(Range,Id) of
      case lookup(Range,Id) of
           [] -> find(T,RecordName,Id);
           [] -> find(T,RecordName,Id);
           Name -> Name end.
           Name -> Name end.
 
 
 lookup(#interval{left=Left,right=Right,name=Name},Id) when Id =< Right, Id >= Left -> Name;
 lookup(#interval{left=Left,right=Right,name=Name},Id) when Id =< Right, Id >= Left -> Name;
-lookup(#interval{},Id) -> [].
+lookup(#interval{},_Id) -> [].
 
 
 get(RecordName, Key) ->
 get(RecordName, Key) ->
     DBA=?DBA,
     DBA=?DBA,

+ 2 - 2
src/kvs_acl.erl

@@ -8,13 +8,13 @@
 -include("group.hrl").
 -include("group.hrl").
 -include("feed.hrl").
 -include("feed.hrl").
 
 
-metainfo() -> 
+metainfo() ->
     #schema{name=kvs,tables=[
     #schema{name=kvs,tables=[
         #table{name=acl,container=true,fields=record_info(fields,acl),keys=[id,accessor]},
         #table{name=acl,container=true,fields=record_info(fields,acl),keys=[id,accessor]},
         #table{name=access,container=acl,fields=record_info(fields,access)}
         #table{name=access,container=acl,fields=record_info(fields,access)}
     ]}.
     ]}.
 
 
-define_access(Accessor, Resource, Action) -> 
+define_access(Accessor, Resource, Action) ->
     Entry = #access{ id={Accessor, Resource}, accessor=Accessor, action=Action},
     Entry = #access{ id={Accessor, Resource}, accessor=Accessor, action=Action},
     case kvs:add(Entry) of
     case kvs:add(Entry) of
         {error, exist} -> kvs:put(Entry#access{action=Action});
         {error, exist} -> kvs:put(Entry#access{action=Action});

+ 1 - 1
src/kvs_feed.erl

@@ -8,7 +8,7 @@
 -include("metainfo.hrl").
 -include("metainfo.hrl").
 -include("state.hrl").
 -include("state.hrl").
 
 
-metainfo() -> 
+metainfo() ->
     #schema{name=kvs,tables=[
     #schema{name=kvs,tables=[
         #table{name=entry,container=true,fields=record_info(fields,entry)},
         #table{name=entry,container=true,fields=record_info(fields,entry)},
         #table{name=comment,container=true,fields=record_info(fields,comment)},
         #table{name=comment,container=true,fields=record_info(fields,comment)},

+ 2 - 2
src/kvs_user.erl

@@ -6,7 +6,7 @@
 -include("metainfo.hrl").
 -include("metainfo.hrl").
 -compile(export_all).
 -compile(export_all).
 
 
-metainfo() -> 
+metainfo() ->
     #schema{name=kvs,tables=[
     #schema{name=kvs,tables=[
         #table{name=user2,container=feed,fields=record_info(fields,user2)},
         #table{name=user2,container=feed,fields=record_info(fields,user2)},
         #table{name=user,container=feed,fields=record_info(fields,user),
         #table{name=user,container=feed,fields=record_info(fields,user),
@@ -21,6 +21,6 @@ handle_notice([kvs_user, user, Owner, delete], [#user{}=U], #state{owner=Owner}=
     kvs:info(?MODULE,"[kvs_user] delete user: ~p", [U]),
     kvs:info(?MODULE,"[kvs_user] delete user: ~p", [U]),
     {noreply, State};
     {noreply, State};
 
 
-handle_notice(_Route, _Message, State) -> 
+handle_notice(_Route, _Message, State) ->
     kvs:info(?MODULE,"[kvs_user] unknown notice."),
     kvs:info(?MODULE,"[kvs_user] unknown notice."),
     {noreply, State}.
     {noreply, State}.

+ 3 - 3
src/store_kai.erl

@@ -11,7 +11,7 @@ start() -> kai:start(), ok.
 stop() -> kai_store:stop(), ok.
 stop() -> kai_store:stop(), ok.
 version() -> {version,"KVS KAI"}.
 version() -> {version,"KVS KAI"}.
 join() -> initialize(), ok.
 join() -> initialize(), ok.
-join(Node) -> initialize(), ok.
+join(_Node) -> initialize(), ok.
 initialize() -> ok.
 initialize() -> ok.
 dir() -> [{table,T}||T<-kvs:modules()].
 dir() -> [{table,T}||T<-kvs:modules()].
 
 
@@ -24,7 +24,7 @@ kai_put(Record) ->
         vector_clocks = vclock:fresh(), value = Record },
         vector_clocks = vclock:fresh(), value = Record },
     kai_store:put(Data).
     kai_store:put(Data).
 
 
-update(Record, Object) -> ok.
+update(_Record, _Object) -> ok.
 
 
 get(Tab, Key) ->
 get(Tab, Key) ->
     Data = #data{key=Key,bucket=table_to_num(Tab)},
     Data = #data{key=Key,bucket=table_to_num(Tab)},
@@ -56,7 +56,7 @@ all(RecordName) ->
     {list_of_data,List} = kai_store:list(table_to_num(RecordName)),
     {list_of_data,List} = kai_store:list(table_to_num(RecordName)),
     [ begin {ok,Val}=kai_get(Data),Val end || Data <- List ].
     [ begin {ok,Val}=kai_get(Data),Val end || Data <- List ].
 
 
-all_by_index(Tab, IndexId, IndexVal) -> [].
+all_by_index(_Tab, _IndexId, _IndexVal) -> [].
 
 
 table_to_num(user)         -> 10;
 table_to_num(user)         -> 10;
 table_to_num(subscription) -> 11;
 table_to_num(subscription) -> 11;

+ 1 - 1
src/store_mnesia.erl

@@ -41,7 +41,7 @@ delete(Tab, Key) ->
 count(RecordName) -> mnesia:table_info(RecordName, size).
 count(RecordName) -> mnesia:table_info(RecordName, size).
 all(R) -> lists:flatten(many(fun() -> L= mnesia:all_keys(R), [ mnesia:read({R, G}) || G <- L ] end)).
 all(R) -> lists:flatten(many(fun() -> L= mnesia:all_keys(R), [ mnesia:read({R, G}) || G <- L ] end)).
 next_id(RecordName, Incr) -> mnesia:dirty_update_counter({id_seq, RecordName}, Incr).
 next_id(RecordName, Incr) -> mnesia:dirty_update_counter({id_seq, RecordName}, Incr).
-many(Fun) -> case mnesia:activity(context(),Fun) of {atomic, R} -> R; X -> X; _ -> [] end.
+many(Fun) -> case mnesia:activity(context(),Fun) of {atomic, R} -> R; X -> X end.
 void(Fun) -> case mnesia:activity(context(),Fun) of {atomic, ok} -> ok; {aborted, Error} -> {error, Error}; X -> X end.
 void(Fun) -> case mnesia:activity(context(),Fun) of {atomic, ok} -> ok; {aborted, Error} -> {error, Error}; X -> X end.
 create_table(Name,Options) ->
 create_table(Name,Options) ->
     X = mnesia:create_table(Name, Options),
     X = mnesia:create_table(Name, Options),

+ 1 - 1
src/store_redis.erl

@@ -63,7 +63,7 @@ delete(RecordName,Key) ->
         {ok,<<"1">>} -> ok;
         {ok,<<"1">>} -> ok;
         E -> {error, E} end.
         E -> {error, E} end.
 count(RecordName) -> length(redis_keys(RecordName)).
 count(RecordName) -> length(redis_keys(RecordName)).
-all(RecordName) -> 
+all(RecordName) ->
     Keys = redis_keys(RecordName),
     Keys = redis_keys(RecordName),
     List = redis_transaction(fun() -> [redis_get(Key) || Key <- Keys] end),
     List = redis_transaction(fun() -> [redis_get(Key) || Key <- Keys] end),
     case RecordName of
     case RecordName of

+ 1 - 1
src/store_riak.erl

@@ -143,7 +143,7 @@ next_id(CounterId, Incr) -> next_id(CounterId, 0, Incr).
 next_id(CounterId, Default, Incr) ->
 next_id(CounterId, Default, Incr) ->
     {ok,C}=riak:local_client(),
     {ok,C}=riak:local_client(),
     CounterBin = key_to_bin(CounterId),
     CounterBin = key_to_bin(CounterId),
-    {Object, Value, Options} =
+    {Object, Value, _Options} =
         case C:get(key_to_bin(id_seq), CounterBin) of
         case C:get(key_to_bin(id_seq), CounterBin) of
             {ok, CurObj} ->
             {ok, CurObj} ->
                 R = #id_seq{id = CurVal} = riak_object:get_value(CurObj),
                 R = #id_seq{id = CurVal} = riak_object:get_value(CurObj),