*/}}
Browse Source

cleanup printf's

YimingWu 2 years ago
parent
commit
80f1368eea
5 changed files with 8 additions and 12 deletions
  1. 2 2
      la_data.c
  2. 1 1
      la_interface.h
  3. 5 5
      la_kernel.c
  4. 0 1
      la_tns_kernel.c
  5. 0 3
      resources/la_widgets_viewers.c

+ 2 - 2
la_data.c

@@ -3889,7 +3889,7 @@ void la_FreeDifference(laDiff* d, int FromLeft){
     while(dc=lstPopItem(&d->Commands)){ la_FreeDiffCommand(dc,d,FromLeft); }
     while(dcc=lstPopItem(&d->CustomCommands)){ if(dcc->Free) dcc->Free(dcc->Data, FromLeft); }
     while(det=lstPopItem(&d->ExtraTouched)){ memFree(det); }
-    if(d->Description&&d->Description->Ptr){printf("%s\n",d->Description->Ptr);}
+    //if(d->Description&&d->Description->Ptr){printf("%s\n",d->Description->Ptr);}
     strSafeDestroy(&d->Description);
 }
 void laFreeNewerDifferences(){
@@ -4004,7 +4004,7 @@ int la_AddStringDBProp(laDBInst* dbi, laDBProp* dbp, laDiff* diff, laPropPack *p
 }
 int la_AddEnumDBProp(laDBInst* dbi, laDBProp* dbp, laDiff* diff, laPropPack *pp){
     laProp *p = pp->LastPs->p; laEnumItem **Data=0; int len = laGetArrayLength(pp); int ret=0;
-    Data= memAcquireSimple(sizeof(laEnumItem*)*len); printf("len %s %d\n",p->Identifier,len);
+    Data= memAcquireSimple(sizeof(laEnumItem*)*len);
     laGetEnumArray(pp, Data); if(diff&&dbp){
         if(memcmp(dbp->Data, Data, sizeof(laEnumItem*)*len)){ la_GiveDiffCommand(diff, dbi, p, dbp->Data); dbp->Data=Data; ret=1; } else memFree(Data);
     }else laAddDBProp(dbi, p, Data);

+ 1 - 1
la_interface.h

@@ -1755,7 +1755,7 @@ void la_ScanWacomDevices(Display *display, int deviceid);
 
 void laSetFontFolderPath(char* absolute);
 int laGetReady();
-void laShutoff();
+void laShutoff(int SavePreferences);
 void laSaveUserPreferences();
 void laEnsureUserPreferences();
 void laAddExtraExtension(int FileType, ...);

+ 5 - 5
la_kernel.c

@@ -587,8 +587,8 @@ int laGetReady(){
     MAIN.InitDone=1;
 }
 
-void laShutoff(){
-    if(MAIN.SavePreferenceOnExit){ laSaveUserPreferences(); }
+void laShutoff(int SavePrefereces){
+    if(MAIN.SavePreferenceOnExit && SavePrefereces){ laSaveUserPreferences(); }
     transDumpMissMatchRecord("TranslationDump.txt");
 
     if(MAIN.Cleanup) MAIN.Cleanup();
@@ -786,7 +786,7 @@ int la_OnWindowDestroy(Window wnd){
         int empty=0; int mod=laRegisterModifications(1,1,&empty,0);
         if(mod || empty){ laInvoke(0, "LA_managed_save", 0,0,"on_exit=true;",0); return 0; }
 
-        laShutoff();
+        laShutoff(1);
         return 1;
     }
 
@@ -6582,7 +6582,7 @@ void la_DrawWindow(laWindow *w){
     la_WindowDefDraw(w, 0);
 }
 int laFinalize(){
-    if(!laValidateProperties()){ laShutoff(); return 0; }
+    if(!laValidateProperties()){ laShutoff(0); return 0; }
     
     laUiTemplate* uit;
     while(uit=lstPopItem(&MAIN.InitPanelTemplates)) lstAppendItem(&MAIN.PanelTemplates,uit);
@@ -6616,7 +6616,7 @@ void laMainLoop(){
 
         for (w=MAIN.Windows.pFirst;w;w = NextW){
             NextW = w->Item.pNext;
-            if(!la_HandleEvents(w)){ laShutoff(); return; }
+            if(!la_HandleEvents(w)){ laShutoff(1); return; }
         }
 
         if(MAIN.PreDraw){ MAIN.PreDraw(); }

+ 0 - 1
la_tns_kernel.c

@@ -2981,7 +2981,6 @@ int tnsLoadSystemFont(char* from, char* name){
         if(i<9){ option=(i<0)?from:TNS_FONT_LOAD_OPTIONS[i]; sprintf(buf,"%s%s%s",MAIN.WorkingDirectory->Ptr,option,name); }
         else{ option=TNS_FONT_LOAD_OPTIONS_FROM_HOME[i-9]; sprintf(buf,"%s/%s%s",getenv("HOME"),option,name); }
         FT_Face face; FT_Long i,num_faces; FT_Open_Args args; args.flags=FT_OPEN_PATHNAME; args.pathname=buf;
-        printf("%s\n",buf);
         if(FT_Open_Face(f->ftlib, &args, -1, &face )) continue;
         num_faces = face->num_faces; FT_Done_Face(face); int found=0;
         for(int fa=0;fa<num_faces;fa++){

+ 0 - 3
resources/la_widgets_viewers.c

@@ -774,8 +774,6 @@ int OPINV_3DOr2DViewAdjust(laOperator *a, laEvent *e){
     ex->LastX = e->x;
     ex->LastY = e->y;
 
-    printf("%d %d\n",e->x,e->y);
-
     return LA_RUNNING;
 }
 int OPEXT_3DOr2DViewAdjust(laOperator *a, int Mark){
@@ -897,7 +895,6 @@ int OPMOD_CanvasMove(laOperator *a, laEvent *e){
             ex->PanX -= (e->x - uex->LastX) * ex->ZoomX;
             ex->PanY += (e->y - uex->LastY) * ex->ZoomY;
         }
-    printf("%d %d\n",e->x,e->y);
         uex->LastX = e->x;
         uex->LastY = e->y;
         laRedrawCurrentPanel();