[PATCH 1/2] simutil: M9, M11, Minor style fixes and indentation

[PATCH 1/2] simutil: M9, M11, Minor style fixes and indentation

[Jessica Nilsson]

[-- Attachment #1: Type: text/plain, Size: 3183 bytes --]

---
 src/simutil.h |   68 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/simutil.h b/src/simutil.h
index ad84907..cda9d55 100644
--- a/src/simutil.h
+++ b/src/simutil.h
@@ -19,36 +19,39 @@
  *
  */
 
+#define SIM_EFSPN_DC_HOME_PLMN_BIT 0x1
+#define SIM_EFSPN_DC_ROAMING_SPN_BIT 0x2
+
 enum sim_fileid {
-	SIM_EFPL_FILEID = 0x2f05,
-	SIM_EF_ICCID_FILEID = 0x2fe2,
-	SIM_EFIMG_FILEID = 0x4F20,
-	SIM_EFLI_FILEID = 0x6f05,
-	SIM_EF_CPHS_MWIS_FILEID = 0x6f11,
-	SIM_EF_CPHS_CFF_FILEID = 0x6f13,
-	SIM_EF_CPHS_INFORMATION_FILEID = 0x6f16,
-	SIM_EF_CPHS_MBDN_FILEID = 0x6f17,
-	SIM_EFUST_FILEID = 0x6f38,
-	SIM_EFSST_FILEID = 0x6f38, /* same as EFust */
-	SIM_EFMSISDN_FILEID = 0x6f40,
-	SIM_EFSPN_FILEID = 0x6f46,
-	SIM_EFSDN_FILEID = 0x6f49,
-	SIM_EFBDN_FILEID = 0x6f4d,
-	SIM_EFADN_FILEID = 0x6f3a,
-	SIM_EFEST_FILEID = 0x6f56,
-	SIM_EFAD_FILEID = 0x6fad,
-	SIM_EFPHASE_FILEID = 0x6fae,
-	SIM_EFPNN_FILEID = 0x6fc5,
-	SIM_EFOPL_FILEID = 0x6fc6,
-	SIM_EFMBDN_FILEID = 0x6fc7,
-	SIM_EFMBI_FILEID = 0x6fc9,
-	SIM_EFMWIS_FILEID = 0x6fca,
-	SIM_EFCFIS_FILEID = 0x6fcb,
-	SIM_EFSPDI_FILEID = 0x6fcd,
-	SIM_EFECC_FILEID = 0x6fb7,
-	SIM_EFCBMIR_FILEID = 0x6f50,
-	SIM_EFCBMI_FILEID = 0x6f45,
-	SIM_EFCBMID_FILEID = 0x6f48,
+	SIM_EFPL_FILEID =			0x2f05,
+	SIM_EF_ICCID_FILEID =			0x2fe2,
+	SIM_EFIMG_FILEID =			0x4f20,
+	SIM_EFLI_FILEID =			0x6f05,
+	SIM_EF_CPHS_MWIS_FILEID =		0x6f11,
+	SIM_EF_CPHS_CFF_FILEID =		0x6f13,
+	SIM_EF_CPHS_INFORMATION_FILEID =	0x6f16,
+	SIM_EF_CPHS_MBDN_FILEID =		0x6f17,
+	SIM_EFUST_FILEID =			0x6f38,
+	SIM_EFSST_FILEID =			0x6f38, /* same as EFust */
+	SIM_EFMSISDN_FILEID =			0x6f40,
+	SIM_EFSPN_FILEID =			0x6f46,
+	SIM_EFSDN_FILEID =			0x6f49,
+	SIM_EFBDN_FILEID =			0x6f4d,
+	SIM_EFADN_FILEID =			0x6f3a,
+	SIM_EFEST_FILEID =			0x6f56,
+	SIM_EFAD_FILEID =			0x6fad,
+	SIM_EFPHASE_FILEID =			0x6fae,
+	SIM_EFPNN_FILEID =			0x6fc5,
+	SIM_EFOPL_FILEID =			0x6fc6,
+	SIM_EFMBDN_FILEID =			0x6fc7,
+	SIM_EFMBI_FILEID =			0x6fc9,
+	SIM_EFMWIS_FILEID =			0x6fca,
+	SIM_EFCFIS_FILEID =			0x6fcb,
+	SIM_EFSPDI_FILEID =			0x6fcd,
+	SIM_EFECC_FILEID =			0x6fb7,
+	SIM_EFCBMIR_FILEID =			0x6f50,
+	SIM_EFCBMI_FILEID =			0x6f45,
+	SIM_EFCBMID_FILEID =			0x6f48,
 };
 
 /* 51.011 Section 9.3 */
@@ -223,9 +226,6 @@ enum sim_sst_service {
 	SIM_SST_SERVICE_PROVIDER_DISPLAY_INFO =		55
 };
 
-#define SIM_EFSPN_DC_HOME_PLMN_BIT 0x1
-#define SIM_EFSPN_DC_ROAMING_SPN_BIT 0x2
-
 enum ber_tlv_data_type {
 	BER_TLV_DATA_TYPE_UNIVERSAL =		0,
 	BER_TLV_DATA_TYPE_APPLICATION =		1,
@@ -347,8 +347,8 @@ void ber_tlv_iter_init(struct ber_tlv_iter *iter, const unsigned char *pdu,
 unsigned int ber_tlv_iter_get_tag(struct ber_tlv_iter *iter);
 
 enum ber_tlv_data_type ber_tlv_iter_get_class(struct ber_tlv_iter *iter);
-enum ber_tlv_data_encoding_type
-	ber_tlv_iter_get_encoding(struct ber_tlv_iter *iter);
+enum ber_tlv_data_encoding_type ber_tlv_iter_get_encoding(
+						struct ber_tlv_iter *iter);
 
 /*
  * This will return the short tag along with class and encoding information.
-- 
1.7.3.2

Re: [PATCH 1/2] simutil: M9, M11, Minor style fixes and indentation

[Marcel Holtmann]

[-- Attachment #1: Type: text/plain, Size: 543 bytes --]

Hi Jessica,

<snip>
 
>  enum ber_tlv_data_type ber_tlv_iter_get_class(struct ber_tlv_iter *iter);
> -enum ber_tlv_data_encoding_type
> -	ber_tlv_iter_get_encoding(struct ber_tlv_iter *iter);
> +enum ber_tlv_data_encoding_type ber_tlv_iter_get_encoding(
> +						struct ber_tlv_iter *iter);

leave this one out. It is such a rare corner case with return parameter
being an enum and a long function name. There is really no unique right
way to make this look good. Whatever you try the break will be ugly.

Regards

Marcel

Re: [PATCH 1/2] simutil: M9, M11, Minor style fixes and indentation

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

Hi Jessica,

On 01/18/2011 06:32 AM, Jessica Nilsson wrote:
> ---
>  src/simutil.h |   68 ++++++++++++++++++++++++++++----------------------------
>  1 files changed, 34 insertions(+), 34 deletions(-)
> 

This patch has been applied, but I had to merge it with some code
cleanups that were made in the meantime.

Regards,
-Denis