From: David Reiss Date: Wed, 11 Jun 2008 01:14:01 +0000 (+0000) Subject: Another whitespace rampage X-Git-Tag: 0.2.0~685 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=1a2f2187cd9891634080d4aa53a76f50849a1ed1;p=common%2Fthrift.git Another whitespace rampage git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@666477 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/compiler/cpp/src/generate/t_alterl_generator.cc b/compiler/cpp/src/generate/t_alterl_generator.cc index 996b2ad4..5fe8034a 100644 --- a/compiler/cpp/src/generate/t_alterl_generator.cc +++ b/compiler/cpp/src/generate/t_alterl_generator.cc @@ -460,7 +460,7 @@ void t_alterl_generator::generate_service_helpers(t_service* tservice) { for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) { generate_erl_function_helpers(*f_iter); } - f_service_ << "struct_info('i am a dummy struct') -> undefined." << endl; + f_service_ << "struct_info('i am a dummy struct') -> undefined." << endl; } /** @@ -701,7 +701,7 @@ std::string t_alterl_generator::generate_type_term(t_type* type, bool expand_structs) { type = get_true_type(type); - + if (type->is_base_type()) { t_base_type::t_base tbase = ((t_base_type*)type)->get_base(); switch (tbase) { @@ -761,12 +761,12 @@ std::string t_alterl_generator::generate_type_term(t_type* type, } else if (type->is_set()) { t_type *elem_type = ((t_set*)type)->get_elem_type(); - + return "{set, " + generate_type_term(elem_type, false) + "}"; } else if (type->is_list()) { t_type *elem_type = ((t_list*)type)->get_elem_type(); - + return "{list, " + generate_type_term(elem_type, false) + "}"; } diff --git a/compiler/cpp/src/generate/t_alterl_generator.h b/compiler/cpp/src/generate/t_alterl_generator.h index 85ab255e..6e7e12e5 100644 --- a/compiler/cpp/src/generate/t_alterl_generator.h +++ b/compiler/cpp/src/generate/t_alterl_generator.h @@ -16,7 +16,7 @@ class t_alterl_generator : public t_generator { public: t_alterl_generator(t_program* program) : - t_generator(program) + t_generator(program) { program_name_[0] = tolower(program_name_[0]); service_name_[0] = tolower(service_name_[0]); @@ -103,9 +103,9 @@ class t_alterl_generator : public t_generator { /** * write out headers and footers for hrl files */ - + void hrl_header(std::ostream& out, std::string name); - void hrl_footer(std::ostream& out, std::string name); + void hrl_footer(std::ostream& out, std::string name); /** * stuff to spit out at the top of generated files @@ -125,7 +125,7 @@ class t_alterl_generator : public t_generator { std::ofstream f_types_file_; std::ofstream f_types_hrl_file_; - std::ofstream f_consts_; + std::ofstream f_consts_; std::ostringstream f_service_; std::ofstream f_service_file_; std::ofstream f_service_hrl_; diff --git a/lib/alterl/COPYING b/lib/alterl/COPYING index 039f21e3..0101a7dc 100644 --- a/lib/alterl/COPYING +++ b/lib/alterl/COPYING @@ -1,5 +1,5 @@ Thrift Software License -Copyright (c) 2006- Facebook, Inc. +Copyright (c) 2006- Facebook, Inc. Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/lib/alterl/LICENSE b/lib/alterl/LICENSE index 039f21e3..0101a7dc 100644 --- a/lib/alterl/LICENSE +++ b/lib/alterl/LICENSE @@ -1,5 +1,5 @@ Thrift Software License -Copyright (c) 2006- Facebook, Inc. +Copyright (c) 2006- Facebook, Inc. Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by diff --git a/lib/alterl/README b/lib/alterl/README index c1b2760d..7147381e 100644 --- a/lib/alterl/README +++ b/lib/alterl/README @@ -3,11 +3,11 @@ Example session using thrift_client: 118> f(), {ok, C} = thrift_client:start_link("localhost", 9090, thriftTest_thrif t). {ok,<0.271.0>} -119> thrift_client:call(C, testVoid, []). +119> thrift_client:call(C, testVoid, []). {ok,ok} 120> thrift_client:call(C, testVoid, [asdf]). {error,{bad_args,testVoid,[asdf]}} -121> thrift_client:call(C, testI32, [123]). +121> thrift_client:call(C, testI32, [123]). {ok,123} 122> thrift_client:call(C, testAsync, [1]). {ok,ok} @@ -17,7 +17,7 @@ t). {ok,ok} 125> catch thrift_client:call(C, testException, ["Xception"]). {xception,1001,"This is an Xception"} -126> thrift_client:call(C, testException, ["Xception"]). +126> thrift_client:call(C, testException, ["Xception"]). =ERROR REPORT==== 24-Feb-2008::23:00:23 === Error in process <0.269.0> with exit value: {{nocatch,{xception,1001,"This is an diff --git a/lib/alterl/src/thrift_binary_protocol.erl b/lib/alterl/src/thrift_binary_protocol.erl index fce6c423..e53f5ef7 100644 --- a/lib/alterl/src/thrift_binary_protocol.erl +++ b/lib/alterl/src/thrift_binary_protocol.erl @@ -308,4 +308,4 @@ new_protocol_factory(TransportFactory, Options) -> {strict_write, ParsedOpts#tbp_opts.strict_write}]) end, {ok, F}. - + diff --git a/lib/alterl/src/thrift_socket_server.erl b/lib/alterl/src/thrift_socket_server.erl index 2bb9181a..173fa79d 100644 --- a/lib/alterl/src/thrift_socket_server.erl +++ b/lib/alterl/src/thrift_socket_server.erl @@ -15,19 +15,19 @@ -export([start/1, stop/1]). -export([init/1, handle_call/3, handle_cast/2, terminate/2, code_change/3, - handle_info/2]). + handle_info/2]). -export([acceptor_loop/1]). -record(thrift_socket_server, - {port, + {port, service, handler, - name, - max=2048, - ip=any, - listen=null, - acceptor=null, + name, + max=2048, + ip=any, + listen=null, + acceptor=null, socket_opts=[{recv_timeout, 500}] }). @@ -70,14 +70,14 @@ parse_options([{port, Port} | Rest], State) -> parse_options(Rest, State#thrift_socket_server{port=Port}); parse_options([{ip, Ip} | Rest], State) -> ParsedIp = case Ip of - any -> - any; - Ip when is_tuple(Ip) -> - Ip; - Ip when is_list(Ip) -> - {ok, IpTuple} = inet_parse:address(Ip), - IpTuple - end, + any -> + any; + Ip when is_tuple(Ip) -> + Ip; + Ip when is_list(Ip) -> + {ok, IpTuple} = inet_parse:address(Ip), + IpTuple + end, parse_options(Rest, State#thrift_socket_server{ip=ParsedIp}); parse_options([{socket_opts, L} | Rest], State) when is_list(L), length(L) > 0 -> parse_options(Rest, State#thrift_socket_server{socket_opts=L}); @@ -87,35 +87,35 @@ parse_options([{service, Service} | Rest], State) -> parse_options(Rest, State#thrift_socket_server{service=Service}); parse_options([{max, Max} | Rest], State) -> MaxInt = case Max of - Max when is_list(Max) -> - list_to_integer(Max); - Max when is_integer(Max) -> - Max - end, + Max when is_list(Max) -> + list_to_integer(Max); + Max when is_integer(Max) -> + Max + end, parse_options(Rest, State#thrift_socket_server{max=MaxInt}). start_server(State=#thrift_socket_server{name=Name}) -> case Name of - undefined -> - gen_server:start_link(?MODULE, State, []); - _ -> - gen_server:start_link(Name, ?MODULE, State, []) + undefined -> + gen_server:start_link(?MODULE, State, []); + _ -> + gen_server:start_link(Name, ?MODULE, State, []) end. init(State=#thrift_socket_server{ip=Ip, port=Port}) -> process_flag(trap_exit, true), BaseOpts = [binary, - {reuseaddr, true}, - {packet, 0}, - {backlog, 4096}, - {recbuf, 8192}, - {active, false}], + {reuseaddr, true}, + {packet, 0}, + {backlog, 4096}, + {recbuf, 8192}, + {active, false}], Opts = case Ip of - any -> + any -> BaseOpts; - Ip -> - [{ip, Ip} | BaseOpts] - end, + Ip -> + [{ip, Ip} | BaseOpts] + end, case gen_tcp_listen(Port, Opts, State) of {stop, eacces} -> %% fdsrv module allows another shot to bind @@ -144,11 +144,11 @@ init(State=#thrift_socket_server{ip=Ip, port=Port}) -> gen_tcp_listen(Port, Opts, State) -> case gen_tcp:listen(Port, Opts) of {ok, Listen} -> - {ok, ListenPort} = inet:port(Listen), - {ok, new_acceptor(State#thrift_socket_server{listen=Listen, + {ok, ListenPort} = inet:port(Listen), + {ok, new_acceptor(State#thrift_socket_server{listen=Listen, port=ListenPort})}; - {error, Reason} -> - {stop, Reason} + {error, Reason} -> + {stop, Reason} end. new_acceptor(State=#thrift_socket_server{max=0}) -> @@ -166,8 +166,8 @@ new_acceptor(State=#thrift_socket_server{acceptor=OldPid, listen=Listen, acceptor_loop({Server, Listen, Service, Handler, SocketOpts}) when is_pid(Server), is_list(SocketOpts) -> case catch gen_tcp:accept(Listen) of % infinite timeout - {ok, Socket} -> - gen_server:cast(Server, {accepted, self()}), + {ok, Socket} -> + gen_server:cast(Server, {accepted, self()}), ProtoGen = fun() -> {ok, SocketTransport} = thrift_socket_transport:new(Socket, SocketOpts), {ok, BufferedTransport} = thrift_buffered_transport:new(SocketTransport), @@ -175,14 +175,14 @@ acceptor_loop({Server, Listen, Service, Handler, SocketOpts}) {ok, IProt=Protocol, OProt=Protocol} end, thrift_processor:init({Server, ProtoGen, Service, Handler}); - {error, closed} -> - exit({error, closed}); - Other -> - error_logger:error_report( - [{application, thrift}, - "Accept failed error", - lists:flatten(io_lib:format("~p", [Other]))]), - exit({error, accept_failed}) + {error, closed} -> + exit({error, closed}); + Other -> + error_logger:error_report( + [{application, thrift}, + "Accept failed error", + lists:flatten(io_lib:format("~p", [Other]))]), + exit({error, accept_failed}) end. handle_call({get, port}, _From, State=#thrift_socket_server{port=Port}) -> @@ -192,7 +192,7 @@ handle_call(_Message, _From, State) -> {reply, Res, State}. handle_cast({accepted, Pid}, - State=#thrift_socket_server{acceptor=Pid, max=Max}) -> + State=#thrift_socket_server{acceptor=Pid, max=Max}) -> % io:format("accepted ~p~n", [Pid]), State1 = State#thrift_socket_server{max=Max - 1}, {noreply, new_acceptor(State1)}; @@ -213,27 +213,27 @@ code_change(_OldVsn, State, _Extra) -> State. handle_info({'EXIT', Pid, normal}, - State=#thrift_socket_server{acceptor=Pid}) -> + State=#thrift_socket_server{acceptor=Pid}) -> {noreply, new_acceptor(State)}; handle_info({'EXIT', Pid, Reason}, - State=#thrift_socket_server{acceptor=Pid}) -> + State=#thrift_socket_server{acceptor=Pid}) -> error_logger:error_report({?MODULE, ?LINE, - {acceptor_error, Reason}}), + {acceptor_error, Reason}}), timer:sleep(100), {noreply, new_acceptor(State)}; handle_info({'EXIT', _LoopPid, Reason}, - State=#thrift_socket_server{acceptor=Pid, max=Max}) -> + State=#thrift_socket_server{acceptor=Pid, max=Max}) -> case Reason of - normal -> ok; + normal -> ok; shutdown -> ok; - _ -> error_logger:error_report({?MODULE, ?LINE, + _ -> error_logger:error_report({?MODULE, ?LINE, {child_error, Reason, erlang:get_stacktrace()}}) end, State1 = State#thrift_socket_server{max=Max + 1}, State2 = case Pid of - null -> new_acceptor(State1); - _ -> State1 - end, + null -> new_acceptor(State1); + _ -> State1 + end, {noreply, State2}; handle_info(Info, State) -> error_logger:info_report([{'INFO', Info}, {'State', State}]), diff --git a/lib/cpp/src/transport/TServerSocket.cpp b/lib/cpp/src/transport/TServerSocket.cpp index 094495d3..e1c9906d 100644 --- a/lib/cpp/src/transport/TServerSocket.cpp +++ b/lib/cpp/src/transport/TServerSocket.cpp @@ -170,7 +170,7 @@ void TServerSocket::listen() { #ifdef IPV6_V6ONLY int zero = 0; - if (-1 == setsockopt(serverSocket_, IPPROTO_IPV6, IPV6_V6ONLY, + if (-1 == setsockopt(serverSocket_, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero))) { GlobalOutput("TServerSocket::listen() IPV6_V6ONLY"); }