Ancient use of hard tabs was upsetting Roker's compiler.
authorKrista Bennett <krista@pep-project.org>
Thu, 24 May 2018 05:48:04 +0200
changeset 2688a34d253c9292
parent 2683 50dde138a786
child 2689 3523c1d4218a
child 2690 82d925538dd1
child 2691 6e7b73c67701
child 2692 dfe058245ed8
Ancient use of hard tabs was upsetting Roker's compiler.
src/etpan_mime.c
src/pEpEngine.c
     1.1 --- a/src/etpan_mime.c	Tue May 22 11:08:19 2018 +0200
     1.2 +++ b/src/etpan_mime.c	Thu May 24 05:48:04 2018 +0200
     1.3 @@ -37,28 +37,28 @@
     1.4          int force_single
     1.5      )
     1.6  {
     1.7 -	struct mailmime * build_info;
     1.8 -	clist * list = NULL;
     1.9 -	int r;
    1.10 -	int mime_type;
    1.11 +    struct mailmime * build_info;
    1.12 +    clist * list = NULL;
    1.13 +    int r;
    1.14 +    int mime_type;
    1.15      char * attr_name = NULL;
    1.16      char * attr_value = NULL;
    1.17      struct mailmime_parameter * param = NULL;
    1.18      clist * parameters = NULL;
    1.19      char *boundary = NULL;
    1.20  
    1.21 -	list = NULL;
    1.22 +    list = NULL;
    1.23  
    1.24 -	if (force_single) {
    1.25 -		mime_type = MAILMIME_SINGLE;
    1.26 -	}
    1.27 -	else {
    1.28 -		switch (content->ct_type->tp_type) {
    1.29 -			case MAILMIME_TYPE_DISCRETE_TYPE:
    1.30 +    if (force_single) {
    1.31 +        mime_type = MAILMIME_SINGLE;
    1.32 +    }
    1.33 +    else {
    1.34 +        switch (content->ct_type->tp_type) {
    1.35 +            case MAILMIME_TYPE_DISCRETE_TYPE:
    1.36                  mime_type = MAILMIME_SINGLE;
    1.37                  break;
    1.38  
    1.39 -			case MAILMIME_TYPE_COMPOSITE_TYPE:
    1.40 +            case MAILMIME_TYPE_COMPOSITE_TYPE:
    1.41                  switch (content->ct_type->tp_data.tp_composite_type->ct_type) {
    1.42                      case MAILMIME_COMPOSITE_TYPE_MULTIPART:
    1.43                          mime_type = MAILMIME_MULTIPLE;
    1.44 @@ -76,60 +76,60 @@
    1.45                  }
    1.46                  break;
    1.47  
    1.48 -			default:
    1.49 +            default:
    1.50                  goto enomem;
    1.51 -		}
    1.52 -	}
    1.53 +        }
    1.54 +    }
    1.55  
    1.56 -	if (mime_type == MAILMIME_MULTIPLE) {
    1.57 -		list = clist_new();
    1.58 +    if (mime_type == MAILMIME_MULTIPLE) {
    1.59 +        list = clist_new();
    1.60          assert(list);
    1.61 -		if (list == NULL)
    1.62 -			goto enomem;
    1.63 +        if (list == NULL)
    1.64 +            goto enomem;
    1.65  
    1.66 -		attr_name = strdup("boundary");
    1.67 +        attr_name = strdup("boundary");
    1.68          assert(attr_name);
    1.69          if (attr_name == NULL)
    1.70              goto enomem;
    1.71  
    1.72 -		boundary = generate_boundary();
    1.73 +        boundary = generate_boundary();
    1.74          assert(boundary);
    1.75 -		attr_value = boundary;
    1.76 -		if (attr_value == NULL)
    1.77 -			goto enomem;
    1.78 +        attr_value = boundary;
    1.79 +        if (attr_value == NULL)
    1.80 +            goto enomem;
    1.81  
    1.82 -		param = mailmime_parameter_new(attr_name, attr_value);
    1.83 +        param = mailmime_parameter_new(attr_name, attr_value);
    1.84          assert(param);
    1.85 -		if (param == NULL)
    1.86 -			goto enomem;
    1.87 +        if (param == NULL)
    1.88 +            goto enomem;
    1.89          attr_name = NULL;
    1.90          attr_value = NULL;
    1.91  
    1.92 -		if (content->ct_parameters == NULL) {
    1.93 -			parameters = clist_new();
    1.94 +        if (content->ct_parameters == NULL) {
    1.95 +            parameters = clist_new();
    1.96              assert(parameters);
    1.97 -			if (parameters == NULL)
    1.98 -				goto enomem;
    1.99 -		}
   1.100 -		else {
   1.101 -			parameters = content->ct_parameters;
   1.102 +            if (parameters == NULL)
   1.103 +                goto enomem;
   1.104 +        }
   1.105 +        else {
   1.106 +            parameters = content->ct_parameters;
   1.107          }
   1.108  
   1.109 -		r = clist_append(parameters, param);
   1.110 -		if (r)
   1.111 -			goto enomem;
   1.112 +        r = clist_append(parameters, param);
   1.113 +        if (r)
   1.114 +            goto enomem;
   1.115          param = NULL;
   1.116  
   1.117 -		if (content->ct_parameters == NULL)
   1.118 -			content->ct_parameters = parameters;
   1.119 -	}
   1.120 +        if (content->ct_parameters == NULL)
   1.121 +            content->ct_parameters = parameters;
   1.122 +    }
   1.123  
   1.124      build_info = mailmime_new(mime_type, NULL, 0, mime_fields, content, NULL,
   1.125              NULL, NULL, list, NULL, NULL);
   1.126 -	if (build_info == NULL)
   1.127 -		goto enomem;
   1.128 +    if (build_info == NULL)
   1.129 +        goto enomem;
   1.130  
   1.131 -	return build_info;
   1.132 +    return build_info;
   1.133  
   1.134  enomem:
   1.135      if (list)
   1.136 @@ -141,17 +141,17 @@
   1.137              clist_free(parameters);
   1.138      if (param)
   1.139          mailmime_parameter_free(param);
   1.140 -	return NULL;
   1.141 +    return NULL;
   1.142  }
   1.143  
   1.144  struct mailmime * get_pgp_encrypted_part(void)
   1.145  {
   1.146 -	struct mailmime * mime = NULL;
   1.147 -	struct mailmime_fields * mime_fields = NULL;
   1.148 -	struct mailmime_content * content = NULL;
   1.149 +    struct mailmime * mime = NULL;
   1.150 +    struct mailmime_fields * mime_fields = NULL;
   1.151 +    struct mailmime_content * content = NULL;
   1.152      int r;
   1.153  
   1.154 -	content = mailmime_content_new_with_str("application/pgp-encrypted");
   1.155 +    content = mailmime_content_new_with_str("application/pgp-encrypted");
   1.156      if (content == NULL)
   1.157          goto enomem;
   1.158  
   1.159 @@ -159,7 +159,7 @@
   1.160      if (mime_fields == NULL)
   1.161          goto enomem;
   1.162  
   1.163 -	mime = part_new_empty(content, mime_fields, 1);
   1.164 +    mime = part_new_empty(content, mime_fields, 1);
   1.165      if (mime == NULL)
   1.166          goto enomem;
   1.167      mime_fields = NULL;
   1.168 @@ -169,7 +169,7 @@
   1.169      if (r != 0)
   1.170          goto enomem;
   1.171  
   1.172 -	return mime;
   1.173 +    return mime;
   1.174  
   1.175  enomem:
   1.176      if (content)
   1.177 @@ -191,12 +191,12 @@
   1.178      )
   1.179  {
   1.180      char * disposition_name = NULL;
   1.181 -	struct mailmime_fields * mime_fields = NULL;
   1.182 -	struct mailmime * mime = NULL;
   1.183 -	struct mailmime_content * content = NULL;
   1.184 -	struct mailmime_parameter * param = NULL;
   1.185 -	struct mailmime_disposition * disposition = NULL;
   1.186 -	struct mailmime_mechanism * encoding = NULL;
   1.187 +    struct mailmime_fields * mime_fields = NULL;
   1.188 +    struct mailmime * mime = NULL;
   1.189 +    struct mailmime_content * content = NULL;
   1.190 +    struct mailmime_parameter * param = NULL;
   1.191 +    struct mailmime_disposition * disposition = NULL;
   1.192 +    struct mailmime_mechanism * encoding = NULL;
   1.193      char* content_id = NULL;
   1.194      int r;
   1.195                  
   1.196 @@ -237,7 +237,7 @@
   1.197      disposition = NULL;
   1.198      content_id = NULL;
   1.199  
   1.200 -	content = mailmime_content_new_with_str(mime_type);
   1.201 +    content = mailmime_content_new_with_str(mime_type);
   1.202      if (content == NULL)
   1.203          goto enomem;
   1.204      
   1.205 @@ -248,7 +248,7 @@
   1.206              goto enomem;
   1.207      }
   1.208  
   1.209 -	mime = part_new_empty(content, mime_fields, 1);
   1.210 +    mime = part_new_empty(content, mime_fields, 1);
   1.211      if (mime == NULL)
   1.212          goto enomem;
   1.213      content = NULL;
   1.214 @@ -259,8 +259,8 @@
   1.215          if (r != 0)
   1.216              goto enomem;
   1.217      }
   1.218 -	
   1.219 -	return mime;
   1.220 +    
   1.221 +    return mime;
   1.222  
   1.223  enomem:
   1.224      free(disposition_name);
     2.1 --- a/src/pEpEngine.c	Tue May 22 11:08:19 2018 +0200
     2.2 +++ b/src/pEpEngine.c	Thu May 24 05:48:04 2018 +0200
     2.3 @@ -2809,7 +2809,8 @@
     2.4      sqlite3_reset(session->unset_identity_flags);
     2.5      if (result != SQLITE_DONE)
     2.6          return PEP_CANNOT_SET_IDENTITY;
     2.7 -        identity->flags &= ~flags;
     2.8 +
     2.9 +    identity->flags &= ~flags;
    2.10  
    2.11      return PEP_STATUS_OK;
    2.12  }