5 files changed, 11 insertions, 34 deletions
diff --git a/src/c/string/ascii/gasciia.c b/src/c/string/ascii/gasciia.c
index ec11d6e..5fe95e0 100644
--- a/src/c/string/ascii/gasciia.c
+++ b/src/c/string/ascii/gasciia.c
@@ -14,12 +14,12 @@
     into its ascii equivalent.
 */
 #include "ascii.h"
-void gasciia(char *str,int size,int* oup)
+void gasciia(char *str,int size,uint8* oup)
 {
 	int i;
   for(i=0;i<size;i++)
   {
-    *(oup+i)=(int)str[i];
+    *(oup+i)=str[i];
   }
 
 }
diff --git a/src/c/string/disp/zdispa.c b/src/c/string/disp/zdispa.c
index 6f651b8..94b24e9 100644
--- a/src/c/string/disp/zdispa.c
+++ b/src/c/string/disp/zdispa.c
@@ -16,11 +16,7 @@ double zdispa (doubleComplex* in, int rows, int columns){
 	int i = 0,j = 0;
 	
 	for (i = 0; i < rows; ++i) {
-<<<<<<< HEAD
-		for (j=0;j<columns;j++) printf("  %1.20lf + %1.20lfi  " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); 
-=======
-		for (j=0;j<columns;j++) printf("  %1.20f + %1.20fi  " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); 
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
+		for (j=0;j<columns;j++) printf("  %e + %ei  " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); 
 		printf("\n");
 	}
 	return 0;
diff --git a/src/c/string/disp/zdisps.c b/src/c/string/disp/zdisps.c
index c4ec137..4a040cd 100644
--- a/src/c/string/disp/zdisps.c
+++ b/src/c/string/disp/zdisps.c
@@ -14,6 +14,6 @@
 
 double zdisps (doubleComplex in) {	
 
-  printf("  %1.20f + %1.20fi  \n" ,zreals(in) ,zimags(in)); 
+  printf("  %e + %ei  \n" ,zreals(in) ,zimags(in)); 
   return 0;
 }
diff --git a/src/c/string/includes/ascii.h b/src/c/string/includes/ascii.h
index fcf969d..39aeb83 100644
--- a/src/c/string/includes/ascii.h
+++ b/src/c/string/includes/ascii.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-void gasciia(char* str,int size,int* oup);
+void gasciia(char* str,int size,uint8* oup);
 void dasciia(double* inp,int size,char* oup);
 
 #ifdef __cplusplus
diff --git a/src/c/string/strcspn/gstrcspna.c b/src/c/string/strcspn/gstrcspna.c
index 75912e9..2c83c72 100644
--- a/src/c/string/strcspn/gstrcspna.c
+++ b/src/c/string/strcspn/gstrcspna.c
@@ -14,14 +14,13 @@
 #include "strcspn.h"
 uint8 gstrcspna(char *str1,int size1,char *str2,int size2)
 {
-    int ind,i,j;;
-    for(i=0;i<=size1;i++)
-    int j;
-    for(i=0;i<=size1;i++)
+    int ind,i,j;
+    
+    for(i=0;i<=size2;i++)
     {
-      for(j=0;j<=size2;j++)
+      for(j=0;j<=size1;j++)
       {
-        if(str2[j]==str1[i])
+        if(str2[i]==str1[j])
         {
           ind=j;
           break;
@@ -30,22 +29,4 @@ uint8 gstrcspna(char *str1,int size1,char *str2,int size2)
     }
     return (ind+1);
 }
-/*int main()
-{
-    int n1,n2;
-    char inp1[100000],inp2[100000];
-    printf("Enter the length of the first string");
-    scanf("%d",&n1);
-    for(int i=0;i<=(n1+1);i++)
-    {
-      scanf("%c",&inp1[i]);
-    }
-    printf("Enter the length of the second string");
-    scanf("%d",&n2 );
-    for(int j=0;j<=(n2+1);j++)
-    {
-      scanf("%c",&inp2[j]);
-    }
-    strcspnfn(inp1,n1+1,inp2,n2+1);
-}
-*/
+