Commits

Anonymous committed e9b1700

Remove the _t suffices from type names.

Comments (0)

Files changed (2)

mime/mime_entity.ml

 let jout = Cf_journal.stdout
 (**)
 
-type cte_t =
+type cte =
     | CTE_binary
     | CTE_7bit
     | CTE_8bit
     | CTE_base64 -> s_base64_
     | CTE_extend s -> s_extend_ ^ s
 
-type ct_type_t =
+type ct_type =
     | CT_text
     | CT_image
     | CT_audio
     | CT_multipart -> s_multipart_
     | CT_extend s -> s_extend_ ^ s
 
-type ct_t = {
-    ct_type: ct_type_t;
+type ct = {
+    ct_type: ct_type;
     ct_subtype: string;
     ct_parameters: string Mime_atom.Map.t;
 }
 
-type cd_type_t =
+type cd_type =
     | CD_inline
     | CD_attachment
     | CD_extend of string
 
-let cd_type_of_string =
+let cdype_of_string =
     let of_extend_string = x_of_extend_string_ (fun x -> CD_extend x) in
     fun s ->
         match String.lowercase s with
         | "attachment" -> Some CD_attachment
         | s ->  of_extend_string s
 
-let cd_type_to_string =
+let cd_type_of_string =
     let s_inline_ = "inline" in
     let s_attachment_ = "attachment" in
     function
     | CD_attachment -> s_attachment_
     | CD_extend s -> s_extend_ ^ s
 
-type cd_t = {
-    cd_type: cd_type_t;
+type cd = {
+    cd_type: cd_type;
     cd_parameters: string Mime_atom.Map.t;
 }
 
 class type headers = object
-    method content_type: ct_t option
-    method content_disposition: cd_t option
-    method content_transfer_encoding: cte_t option
+    method content_type: ct option
+    method content_disposition: cd option
+    method content_transfer_encoding: cte option
     method content_description: string option
     method content_length: int64 option
     method content_id: (string * string) option
             }
     and p_content_disposition =
         L.parse_token >>= fun cd_type ->
-        match cd_type_of_string cd_type with
+        match cdype_of_string cd_type with
         | None ->
             P.err ()
         | Some cd_type ->
         L.emit_parameters pp ct.ct_parameters
     in
     let e_content_disposition pp cd =
-        L.emit_folding_string pp (cd_type_to_string cd.cd_type);
+        L.emit_folding_string pp (cd_type_of_string cd.cd_type);
         L.emit_parameters pp cd.cd_parameters
     in
     let e_content_transfer_encoding pp cte =

mime/mime_entity.mli

   OF THE POSSIBILITY OF SUCH DAMAGE. 
  *---------------------------------------------------------------------------*)
 
-type cte_t =
+type cte =
     | CTE_binary
     | CTE_7bit
     | CTE_8bit
     | CTE_base64
     | CTE_extend of string
 
-val cte_of_string: string -> cte_t option
-val cte_to_string: cte_t -> string
+val cte_of_string: string -> cte option
+val cte_to_string: cte -> string
 
-type ct_type_t =
+type ct_type =
     | CT_text
     | CT_image
     | CT_audio
     | CT_multipart
     | CT_extend of string
 
-val ct_type_of_string: string -> ct_type_t option
-val ct_type_to_string: ct_type_t -> string
+val ct_type_of_string: string -> ct_type option
+val ct_type_to_string: ct_type -> string
 
-type ct_t = {
-    ct_type: ct_type_t;
+type ct = {
+    ct_type: ct_type;
     ct_subtype: string;
     ct_parameters: string Mime_atom.Map.t;
 }
 
-type cd_type_t =
+type cd_type =
     | CD_inline
     | CD_attachment
     | CD_extend of string
 
-type cd_t = {
-    cd_type: cd_type_t;
+type cd = {
+    cd_type: cd_type;
     cd_parameters: string Mime_atom.Map.t;
 }
 
 class type headers = object
-    method content_type: ct_t option
-    method content_disposition: cd_t option
-    method content_transfer_encoding: cte_t option
+    method content_type: ct option
+    method content_disposition: cd option
+    method content_transfer_encoding: cte option
     method content_description: string option
     method content_length: int64 option
     method content_id: (string * string) option
 end
 
 class basic_emit_adapter:
-    ?ct:ct_t -> ?cdi:cd_t -> ?cte:cte_t -> ?cde:string -> ?cl:int64 ->
+    ?ct:ct -> ?cdi:cd -> ?cte:cte -> ?cde:string -> ?cl:int64 ->
     ?cid:(string * string) -> (string * string) list ->
     object
         inherit headers
     end
 
 class message_emit_adapter:
-    ?ct:ct_t -> ?cdi:cd_t -> ?cte:cte_t -> ?cde:string -> ?cl:int64 ->
+    ?ct:ct -> ?cdi:cd -> ?cte:cte -> ?cde:string -> ?cl:int64 ->
     ?cid:(string * string) -> (string * string) list ->
     object
         inherit basic_emit_adapter
     end
 
 val emit_basic_headers:
-    ?ct:ct_t -> ?cdi:cd_t -> ?cte:cte_t -> ?cde:string -> ?cl:int64 ->
+    ?ct:ct -> ?cdi:cd -> ?cte:cte -> ?cde:string -> ?cl:int64 ->
     ?cid:(string * string) -> (string * string) list -> basic_emit_adapter
 
 (*--- End of File [ mime_entity.mli ] ---*)